jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #2541 (only for new uploads, flagged posts will still show disapprovals immediately)

Browse Source
This commit is contained in:
r888888888
2015-10-27 11:48:51 -07:00
parent 3008a70b10
commit fea20c84dc
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/moderator/post/queues/show.html.erb
View File

@@ -61,7 +61,7 @@
<li><strong>Appeals</strong>: <%= post_appeal_reasons(post) %></li>
<% end %>
<li>
<strong>Hidden</strong>: <%= render "post_disapprovals/compact_counts", :disapprovals => post.disapprovals %>
<strong>Hidden</strong>: <%= render "post_disapprovals/compact_counts", :disapprovals => post.disapprovals, :post => post %>
</li>
<li><strong>Tags</strong>: <%= post.tag_string %></li>
</ul>

2
app/views/post_disapprovals/_compact_counts.html.erb
View File

@@ -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 %>

2
app/views/post_disapprovals/_counts.html.erb
View File

@@ -1,4 +1,4 @@
<% if disapprovals.count > 0 %>
<% if disapprovals.count > 0 && (CurrentUser.can_approve_posts? || post.created_at < 3.days.ago) %>
<p>
It has been reviewed by <%= pluralize disapprovals.count, "moderator" %>.

4
app/views/posts/partials/show/_notices.html.erb
View File

@@ -21,7 +21,7 @@
<p>This post was deleted</p>
<% end %>
<%= render "post_disapprovals/counts", :disapprovals => post.disapprovals %>
<%= render "post_disapprovals/counts", :disapprovals => post.disapprovals, :post => post %>
</div>
<% 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) %>
<div class="quick-mod">