forked from rDrama/rDrama
1
0
Fork 0
master
Aevann1 2021-07-31 15:52:11 +02:00
parent 9ef9dc7937
commit bdb26bcbc1
3 changed files with 3 additions and 12 deletions

View File

@ -56,7 +56,7 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
backref="submissions")
domain_ref = Column(Integer, ForeignKey("domains.id"))
domain_obj = relationship("Domain")
flags = relationship("Flag", lazy="dynamic")
flags = relationship("Flag", lazy="dynamic").order_by(Flag.created_utc).all()
is_approved = Column(Integer, ForeignKey("users.id"), default=0)
over_18 = Column(Boolean, default=False)
author = relationship(
@ -415,16 +415,11 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
def is_image(self):
if self.url: return self.url.lower().endswith('.jpg') or self.url.lower().endswith('.png') or self.url.lower().endswith('.gif') or self.url.lower().endswith('.jpeg') or self.url.lower().endswith('?maxwidth=9999') or self.url.lower().endswith('?maxwidth=8888')
else: return False
@property
@lazy
def ordered_flags(self):
return self.flags.order_by(Flag.created_utc).all()
@property
@lazy
def active_flags(self):
return self.flags.count()
return len(self.flags)
class SaveRelationship(Base, Stndrd):

View File

@ -73,10 +73,6 @@ def post_id(pid, anything=None, v=None):
post = get_post(pid, v=v)
print(post.flags)
print("sex")
print(post.flags.order_by(Flag.created_utc).all())
if v:
votes = g.db.query(CommentVote).filter_by(user_id=v.id).subquery()

View File

@ -489,7 +489,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 href="{{f.user.url}}">@{{f.user.username}}</a>: {{f.reason}}</li>
{% endfor %}
</ul>