appeals: only show current appeal on appealed posts.

* Only show the current pending appeal in the "This post was appealed"
  notice. Don't show old appeals.

* Don't show both the "This post was deleted" and the "This post was
  appealed" notice on appealed posts. Only show the "This post was
  appealed" notice.

* Show "no reason" if no appeal reason was given.
This commit is contained in:
evazion
2020-08-16 10:54:59 -05:00
parent d4d1088c30
commit 7eb9f0b75e
5 changed files with 13 additions and 21 deletions

View File

@@ -107,7 +107,6 @@
--post-flagged-notice-background: var(--error-background-color);
--post-banned-notice-background: var(--error-background-color);
--post-deleted-notice-background: var(--error-background-color);
--post-appealed-notice-background: #D8F2FC;
--post-resized-notice-background: #EED8FC;
--post-search-notice-background: #EEE;
@@ -386,7 +385,6 @@ body[data-current-user-theme="dark"] {
--post-flagged-notice-background: var(--red-0);
--post-deleted-notice-background: var(--red-0);
--post-banned-notice-background: var(--red-0);
--post-appealed-notice-background: var(--blue-0);
--post-tooltip-background-color: var(--grey-3);
--post-tooltip-border-color: var(--grey-4);

View File

@@ -269,7 +269,6 @@ div#c-posts {
&.post-notice-flagged { background: var(--post-flagged-notice-background); }
&.post-notice-banned { background: var(--post-banned-notice-background); }
&.post-notice-deleted { background: var(--post-deleted-notice-background); }
&.post-notice-appealed { background: var(--post-appealed-notice-background); }
&.post-notice-resized { background: var(--post-resized-notice-background); }
&.post-notice-search { background: var(--post-search-notice-background); }
}

View File

@@ -68,10 +68,10 @@
</span>
<% end %>
<% if (post.is_flagged? || post.is_deleted?) && post.appeals.any? %>
<% if post.is_appealed? %>
<span class="info">
<strong>Appeals</strong>
<%= render "post_appeals/reasons", appeals: post.appeals %>
<%= render "post_appeals/reasons", appeal: post.appeals.select(&:pending?).last %>
</span>
<% end %>
</div>

View File

@@ -1,9 +1,11 @@
<ul class="post-appeal-reasons list-bulleted">
<% appeals.each do |appeal| %>
<li class="post-appeal-reason">
<ul class="post-appeal-reason list-bulleted">
<li>
<% if appeal.reason.present? %>
<span class="prose"><%= format_text(appeal.reason, inline: true) %></span>
- <%= link_to_user(appeal.creator) %>
- <%= time_ago_in_words_tagged(appeal.created_at) %>
</li>
<% end %>
<% else %>
<span class="prose"><em>no reason</em></span>
<% end %>
(<%= link_to_user(appeal.creator) %>, <%= time_ago_in_words_tagged(appeal.created_at) %>)
</li>
</ul>

View File

@@ -12,7 +12,7 @@
</div>
<% end %>
<% if post.is_deleted? %>
<% if post.is_deleted? && !post.is_appealed? %>
<div class="notice notice-small post-notice post-notice-deleted">
<% if post.flags.any? %>
<p>This post was deleted for the following reasons: </p>
@@ -38,6 +38,7 @@
This post was flagged and is pending approval (<%= link_to_wiki "learn more", "about:mod_queue" %>)
<% elsif post.is_appealed? %>
This post was appealed and is pending approval (<%= link_to_wiki "learn more", "about:mod_queue" %>)
<%= render "post_appeals/reasons", appeal: post.appeals.select(&:pending?).last %>
<% end %>
<%= render "post_disapprovals/counts", :disapprovals => post.disapprovals, :post => post %>
@@ -49,14 +50,6 @@
</div>
<% end %>
<% #XXX %>
<% if post.is_deleted? && post.appeals.any? %>
<div class="notice notice-small post-notice post-notice-appealed">
<p>This post was appealed:</p>
<%= render "post_appeals/reasons", appeals: post.appeals %>
</div>
<% end %>
<% if post.parent.present? %>
<div class="notice notice-small post-notice post-notice-child">
<%= render "posts/partials/show/parent_notice", parent: post.parent, children: @sibling_posts.to_a %>