michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-01-23 19:36:56 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'Admin pages: Order recent-first and limit results' (#355) from h3ndrik/pyfedi:order into main

Browse source 
Reviewed-on: https://codeberg.org/rimu/pyfedi/pulls/355
This commit is contained in:
rimu 2024-11-25 20:38:47 +00:00
commit ae63ea9cfb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/admin/routes.py
View file

@ -972,7 +972,7 @@ def admin_content_trash():
page = request.args.get('page', 1, type=int) page = request.args.get('page', 1, type=int)
posts = Post.query.filter(Post.posted_at > utcnow() - timedelta(days=3), Post.deleted == False).order_by(Post.score) posts = Post.query.filter(Post.posted_at > utcnow() - timedelta(days=3), Post.deleted == False, Post.down_votes > 0).order_by(Post.score)
posts = posts.paginate(page=page, per_page=100, error_out=False) posts = posts.paginate(page=page, per_page=100, error_out=False)
next_url = url_for('admin.admin_content_trash', page=posts.next_num) if posts.has_next else None next_url = url_for('admin.admin_content_trash', page=posts.next_num) if posts.has_next else None
@ -1034,12 +1034,12 @@ def admin_content_deleted():
posts = Post.query.\ posts = Post.query.\
filter(Post.deleted == True).\ filter(Post.deleted == True).\
order_by(Post.posted_at) order_by(desc(Post.posted_at))
posts = posts.paginate(page=page, per_page=100, error_out=False) posts = posts.paginate(page=page, per_page=100, error_out=False)
post_replies = PostReply.query. \ post_replies = PostReply.query. \
filter(PostReply.deleted == True). \ filter(PostReply.deleted == True). \
order_by(PostReply.posted_at) order_by(desc(PostReply.posted_at))
post_replies = post_replies.paginate(page=replies_page, per_page=100, error_out=False) post_replies = post_replies.paginate(page=replies_page, per_page=100, error_out=False)
next_url = url_for('admin.admin_content_deleted', page=posts.next_num) if posts.has_next else None next_url = url_for('admin.admin_content_deleted', page=posts.next_num) if posts.has_next else None