From 84ad798f37cb6477711cd49d7911cb558558d926 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 11 Jan 2022 00:53:48 +0200 Subject: [PATCH] bb --- files/classes/comment.py | 3 +-- files/classes/submission.py | 3 +-- files/templates/submission.html | 14 +++++++++++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/files/classes/comment.py b/files/classes/comment.py index 542a4d199..069a6ed91 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -10,7 +10,6 @@ from files.classes.votes import CommentVote from files.helpers.const import AUTOPOLLER_ID, AUTOBETTER_ID, censor_slurs from files.helpers.lazy import lazy from .flags import CommentFlag -from .award import AwardRelationship from random import randint site = environ.get("DOMAIN").strip() @@ -53,7 +52,7 @@ class Comment(Base): senttouser = relationship("User", primaryjoin="User.id==Comment.sentto", viewonly=True) parent_comment = relationship("Comment", remote_side=[id], viewonly=True) child_comments = relationship("Comment", remote_side=[parent_comment_id], viewonly=True) - awards = relationship("AwardRelationship", viewonly=True, order_by=AwardRelationship.id) + awards = relationship("AwardRelationship", viewonly=True) reports = relationship("CommentFlag", viewonly=True) def __init__(self, *args, **kwargs): diff --git a/files/classes/submission.py b/files/classes/submission.py index 09db9f4c8..179682878 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -11,7 +11,6 @@ from files.helpers.const import AUTOPOLLER_ID, AUTOBETTER_ID, censor_slurs, TROL from files.helpers.lazy import lazy from .flags import Flag from .comment import Comment -from .award import AwardRelationship from flask import g site = environ.get("DOMAIN").strip() @@ -57,7 +56,7 @@ class Submission(Base): author = relationship("User", primaryjoin="Submission.author_id==User.id") oauth_app = relationship("OauthApp", viewonly=True) approved_by = relationship("User", uselist=False, primaryjoin="Submission.is_approved==User.id", viewonly=True) - awards = relationship("AwardRelationship", viewonly=True, order_by=AwardRelationship.id) + awards = relationship("AwardRelationship", viewonly=True) reports = relationship("Flag", viewonly=True) def __init__(self, *args, **kwargs): diff --git a/files/templates/submission.html b/files/templates/submission.html index 743c1c849..60c89b6b1 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -16,7 +16,19 @@ {% if p.award_count("wholesome") %}