felixfoertsch/tildes
1
0
Fork 0
mirror of https://gitlab.com/tildes/tildes.git synced 2026-04-17 14:59:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Exclude removed comments from "last comment" link

Browse Source 
The "last comment posted" link in the sidebar on a topic's comments page
was still considering removed comments, so if the last comment in a
topic was removed it would link to that one. That's not very useful for
anyone, so this excludes removed comments the same way that deleted ones
were already excluded.
This commit is contained in:
Deimos
2020-09-03 15:16:21 -06:00
parent 26b1d4dd9b
commit 624123929a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tildes/tildes/models/comment/comment_tree.py
View File

@@ -181,9 +181,9 @@ class CommentTree:
@property
def most_recent_comment(self) -> Optional[Comment]:
"""Return the most recent non-deleted Comment in the tree."""
"""Return the most recent Comment in the tree (excluding deleted/removed)."""
for comment in reversed(self.comments):
if not comment.is_deleted:
if not (comment.is_deleted or comment.is_removed):
return comment
return None

2
tildes/tildes/templates/topic.jinja2
View File

@@ -326,7 +326,7 @@
<dt>Last comment posted</dt>
<dd>
<a href="{{ comments.most_recent_comment.permalink }}" data-js-hide-sidebar-no-preventdefault>
{{ adaptive_date_responsive(topic.last_activity_time) }}
{{ adaptive_date_responsive(comments.most_recent_comment.created_time) }}
</a>
</dd>
{% else %}