From fea20c84dc6fb81914b3125320c0306fc742f324 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Tue, 27 Oct 2015 11:48:51 -0700 Subject: [PATCH] fixes #2541 (only for new uploads, flagged posts will still show disapprovals immediately) --- app/views/moderator/post/queues/show.html.erb | 2 +- app/views/post_disapprovals/_compact_counts.html.erb | 2 +- app/views/post_disapprovals/_counts.html.erb | 2 +- app/views/posts/partials/show/_notices.html.erb | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/moderator/post/queues/show.html.erb b/app/views/moderator/post/queues/show.html.erb index 031c9fef7..2de91f424 100644 --- a/app/views/moderator/post/queues/show.html.erb +++ b/app/views/moderator/post/queues/show.html.erb @@ -61,7 +61,7 @@
  • Appeals: <%= post_appeal_reasons(post) %>
  • <% end %>
  • - Hidden: <%= render "post_disapprovals/compact_counts", :disapprovals => post.disapprovals %> + Hidden: <%= render "post_disapprovals/compact_counts", :disapprovals => post.disapprovals, :post => post %>
  • Tags: <%= post.tag_string %>
  • diff --git a/app/views/post_disapprovals/_compact_counts.html.erb b/app/views/post_disapprovals/_compact_counts.html.erb index e76112a45..5bb3a6b12 100644 --- a/app/views/post_disapprovals/_compact_counts.html.erb +++ b/app/views/post_disapprovals/_compact_counts.html.erb @@ -1,4 +1,4 @@ -<% if disapprovals.count > 0 %> +<% if disapprovals.count > 0 && (CurrentUser.can_approve_posts? || post.created_at < 3.days.ago) %> <% if disapprovals.breaks_rules.count > 0 %> (breaks rules: <%= disapprovals.breaks_rules.count %>) <% end %> diff --git a/app/views/post_disapprovals/_counts.html.erb b/app/views/post_disapprovals/_counts.html.erb index ec046e6fc..e6ec12ead 100644 --- a/app/views/post_disapprovals/_counts.html.erb +++ b/app/views/post_disapprovals/_counts.html.erb @@ -1,4 +1,4 @@ -<% if disapprovals.count > 0 %> +<% if disapprovals.count > 0 && (CurrentUser.can_approve_posts? || post.created_at < 3.days.ago) %>

    It has been reviewed by <%= pluralize disapprovals.count, "moderator" %>. diff --git a/app/views/posts/partials/show/_notices.html.erb b/app/views/posts/partials/show/_notices.html.erb index 7433ef830..b3b61f41a 100644 --- a/app/views/posts/partials/show/_notices.html.erb +++ b/app/views/posts/partials/show/_notices.html.erb @@ -21,7 +21,7 @@

    This post was deleted

    <% end %> - <%= render "post_disapprovals/counts", :disapprovals => post.disapprovals %> + <%= render "post_disapprovals/counts", :disapprovals => post.disapprovals, :post => post %> <% end %> @@ -34,7 +34,7 @@ This post was flagged and is pending approval (<%= link_to "learn more", wiki_pages_path(:title => "about:mod_queue") %>) <% end %> - <%= render "post_disapprovals/counts", :disapprovals => post.disapprovals %> + <%= render "post_disapprovals/counts", :disapprovals => post.disapprovals, :post => post %> <% if CurrentUser.can_approve_posts? && !post.disapproved_by?(CurrentUser.user) %>