forked from rDrama/rDrama
use new pagination system in removed posts and comments
parent
75c9c69bf7
commit
d82f1161cf
|
@ -734,12 +734,15 @@ def admin_delink_relink_alt(v:User, username, other):
|
||||||
@admin_level_required(PERMS['POST_COMMENT_MODERATION'])
|
@admin_level_required(PERMS['POST_COMMENT_MODERATION'])
|
||||||
def admin_removed(v):
|
def admin_removed(v):
|
||||||
page = get_page()
|
page = get_page()
|
||||||
ids = g.db.query(Submission.id).join(Submission.author).filter(or_(Submission.is_banned==True, User.shadowbanned != None)).order_by(Submission.id.desc()).offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE + 1).all()
|
|
||||||
ids=[x[0] for x in ids]
|
|
||||||
next_exists = len(ids) > PAGE_SIZE
|
|
||||||
ids = ids[:PAGE_SIZE]
|
|
||||||
|
|
||||||
posts = get_posts(ids, v=v)
|
listing = g.db.query(Submission).options(load_only(Submission.id)).join(Submission.author).filter(
|
||||||
|
or_(Submission.is_banned==True, User.shadowbanned != None))
|
||||||
|
|
||||||
|
next_exists = listing.count()
|
||||||
|
listing = listing.order_by(Submission.id.desc()).offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE).all()
|
||||||
|
listing = [x.id for x in listing]
|
||||||
|
|
||||||
|
posts = get_posts(listing, v=v)
|
||||||
|
|
||||||
return render_template("admin/removed_posts.html",
|
return render_template("admin/removed_posts.html",
|
||||||
v=v,
|
v=v,
|
||||||
|
@ -756,11 +759,15 @@ def admin_removed(v):
|
||||||
def admin_removed_comments(v):
|
def admin_removed_comments(v):
|
||||||
page = get_page()
|
page = get_page()
|
||||||
|
|
||||||
ids = g.db.query(Comment.id).join(Comment.author).filter(or_(Comment.is_banned==True, User.shadowbanned != None)).order_by(Comment.id.desc()).offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE + 1).all()
|
listing = g.db.query(Comment).options(load_only(Comment.id)).join(Comment.author).filter(
|
||||||
ids=[x[0] for x in ids]
|
or_(Comment.is_banned==True, User.shadowbanned != None))
|
||||||
next_exists = len(ids) > PAGE_SIZE
|
|
||||||
ids = ids[:PAGE_SIZE]
|
next_exists = listing.count()
|
||||||
comments = get_comments(ids, v=v)
|
listing = listing.order_by(Comment.id.desc()).offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE).all()
|
||||||
|
listing = [x.id for x in listing]
|
||||||
|
|
||||||
|
comments = get_comments(listing, v=v)
|
||||||
|
|
||||||
return render_template("admin/removed_comments.html",
|
return render_template("admin/removed_comments.html",
|
||||||
v=v,
|
v=v,
|
||||||
listing=comments,
|
listing=comments,
|
||||||
|
@ -768,6 +775,7 @@ def admin_removed_comments(v):
|
||||||
next_exists=next_exists
|
next_exists=next_exists
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@app.post("/unchud_user/<id>")
|
@app.post("/unchud_user/<id>")
|
||||||
@limiter.limit('1/second', scope=rpath)
|
@limiter.limit('1/second', scope=rpath)
|
||||||
@limiter.limit('1/second', scope=rpath, key_func=get_ID)
|
@limiter.limit('1/second', scope=rpath, key_func=get_ID)
|
||||||
|
|
|
@ -28,22 +28,5 @@
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block pagenav %}
|
{% block pagenav %}
|
||||||
<nav>
|
{% include "pagination.html" %}
|
||||||
<ul class="pagination pagination-sm py-3 pl-3 mb-0">
|
|
||||||
{% if page>1 %}
|
|
||||||
<li class="page-item">
|
|
||||||
<small><a class="page-link" href="?page={{page-1}}" tabindex="-1">Prev</a></small>
|
|
||||||
</li>
|
|
||||||
{% else %}
|
|
||||||
<li class="page-item disabled"><span class="page-link">Prev</span></li>
|
|
||||||
{% endif %}
|
|
||||||
{% if next_exists %}
|
|
||||||
<li class="page-item">
|
|
||||||
<small><a class="page-link" href="?page={{page+1}}">Next</a></small>
|
|
||||||
</li>
|
|
||||||
{% else %}
|
|
||||||
<li class="page-item disabled"><span class="page-link">Next</span></li>
|
|
||||||
{% endif %}
|
|
||||||
</ul>
|
|
||||||
</nav>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
Loading…
Reference in New Issue