skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sfd

Browse source
This commit is contained in:
Aevann1 2022-01-06 21:05:13 +02:00
parent 29507d19bb
commit 87b2ccbb52
5 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
files/classes/comment.py
View file

@ -69,7 +69,7 @@ class Comment(Base):
@property
@lazy
def flags(self):
return g.db.query(CommentFlag).filter_by(comment_id=self.id)
return g.db.query(CommentFlag).filter_by(comment_id=self.id).order_by(CommentFlag.id)
@lazy
def poll_voted(self, v):
@ -399,10 +399,6 @@ class Comment(Base):
@lazy
def active_flags(self): return self.flags.count()
@property
@lazy
def ordered_flags(self): return self.flags.order_by(CommentFlag.id).all()
def options_html(self, v):
html = ""
for o in self.options:

9
files/classes/submission.py
View file

@ -11,6 +11,7 @@ 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()
@ -56,7 +57,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)
awards = relationship("AwardRelationship", viewonly=True, order_by=AwardRelationship.id.desc())
reports = relationship("Flag", viewonly=True)
def __init__(self, *args, **kwargs):
@ -74,7 +75,7 @@ class Submission(Base):
@property
@lazy
def flags(self):
return g.db.query(Flag).filter_by(post_id=self.id)
return g.db.query(Flag).filter_by(post_id=self.id).order_by(Flag.id)
@property
@lazy
@ -430,10 +431,6 @@ class Submission(Base):
@lazy
def active_flags(self): return self.flags.count()
@property
@lazy
def ordered_flags(self): return self.flags.order_by(Flag.id).all()
class SaveRelationship(Base):

2
files/templates/comments.html
View file

@ -228,7 +228,7 @@
<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
<pre></pre>
<ul style="padding-left:20px; margin-bottom: 0;">
{% for f in c.ordered_flags %}
{% for f in c.flags %}
<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}<a role="button" onclick="post_toast('/del_report/c{{ f.id }}')">[remove]</a>{% endif %}</li>
{% endfor %}
</ul>

2
files/templates/submission.html
View file

@ -365,7 +365,7 @@
<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
<pre></pre>
<ul style="padding-left:20px; margin-bottom: 0;">
{% for f in p.ordered_flags %}
{% for f in p.flags %}
<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}<a role="button" onclick="post_toast('/del_report/p{{ f.id }}')">[remove]</a>{% endif %}</li>
{% endfor %}
</ul>

2
files/templates/submission_listing.html
View file

@ -85,7 +85,7 @@
<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
<pre></pre>
<ul style="padding-left:20px; margin-bottom: 0;">
{% for f in p.ordered_flags %}
{% for f in p.flags %}
<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}<a role="button" onclick="post_toast('/del_report/p{{ f.id }}')">[remove]</a>{% endif %}</li>
{% endfor %}
</ul>