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

Prioritize showing comment removal over deletion

Browse Source 
If a comment is removed and then deleted by its author, we should
continue showing it as removed, since that's the more significant action
(and the deletion is usually *because* of the removal).
This commit is contained in:
Deimos
2020-06-02 12:50:40 -06:00
parent e8f8885f22
commit e15359919d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tildes/tildes/templates/macros/comments.jinja2
View File

@@ -72,14 +72,14 @@
{% endif %} {% endif %}
</div> </div>
{% else %} {% else %}
{% if comment.is_deleted %} {% if comment.is_removed %}
<div class="is-comment-deleted">Comment deleted by author</div>
{% elif comment.is_removed %}
{% if comment.removed_marker %} {% if comment.removed_marker %}
<div class="is-comment-removed">{{ comment.removed_marker }}</div> <div class="is-comment-removed">{{ comment.removed_marker }}</div>
{% else %} {% else %}
<div class="is-comment-removed">Comment removed by site admin</div> <div class="is-comment-removed">Comment removed by site admin</div>
{% endif %} {% endif %}
{% elif comment.is_deleted %}
<div class="is-comment-deleted">Comment deleted by author</div>
{% endif %} {% endif %}
{% endif %} {% endif %}