From 69535a30f073fb577bf8c3e7a1b26b585940b30c Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Thu, 8 Dec 2022 17:05:17 +0200 Subject: [PATCH] order assets submissions by most recent last --- files/routes/asset_submissions.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py index 94c80ea31..a804aaa16 100644 --- a/files/routes/asset_submissions.py +++ b/files/routes/asset_submissions.py @@ -30,9 +30,11 @@ def asset_submissions(path): @auth_required def submit_marseys(v:User): if v.admin_level >= PERMS['VIEW_PENDING_SUBMITTED_MARSEYS']: - marseys = g.db.query(Marsey).filter(Marsey.submitter_id != None).all() + marseys = g.db.query(Marsey).filter(Marsey.submitter_id != None) else: - marseys = g.db.query(Marsey).filter(Marsey.submitter_id == v.id).all() + marseys = g.db.query(Marsey).filter(Marsey.submitter_id == v.id) + + marseys = marseys.order_by(Marsey.created_utc).all() for marsey in marseys: marsey.author = g.db.query(User.username).filter_by(id=marsey.author_id).one()[0] @@ -201,8 +203,9 @@ def remove_marsey(v:User, name): @app.get("/submit/hats") @auth_required def submit_hats(v:User): - if v.admin_level >= PERMS['VIEW_PENDING_SUBMITTED_HATS']: hats = g.db.query(HatDef).filter(HatDef.submitter_id != None).all() - else: hats = g.db.query(HatDef).filter(HatDef.submitter_id == v.id).all() + if v.admin_level >= PERMS['VIEW_PENDING_SUBMITTED_HATS']: hats = g.db.query(HatDef).filter(HatDef.submitter_id != None) + else: hats = g.db.query(HatDef).filter(HatDef.submitter_id == v.id) + hats = hats.order_by(HatDef.created_utc).all() return render_template("submit_hats.html", v=v, hats=hats)