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

fixes #2447: Display disapproval counts in status bar to uploader and approvers

Browse Source
This commit is contained in:
r888888888
2015-07-24 14:24:51 -07:00
parent abb232d4e6
commit 40a9f3658c
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,17 @@
It has been reviewed by <%= pluralize disapprovals.count, "moderator" %>.
<% if disapprovals.count > 0 %>
<p>
It has been reviewed by <%= pluralize disapprovals.count, "moderator" %>.
<% if disapprovals.breaks_rules.count > 0 %>
<%= disapprovals.breaks_rules.count %> believe it breaks the rules.
<% end %>
<% if disapprovals.breaks_rules.count > 0 %>
<%= disapprovals.breaks_rules.count %> believe it breaks the rules.
<% end %>
<% if disapprovals.poor_quality.count > 0 %>
<%= disapprovals.poor_quality.count %> believe it has poor quality.
<% end %>
<% if disapprovals.poor_quality.count > 0 %>
<%= disapprovals.poor_quality.count %> believe it has poor quality.
<% end %>
<% if disapprovals.disinterest.count > 0 %>
<%= disapprovals.disinterest.count %> did not like the post enough to approve it.
<% end %>
<% if disapprovals.disinterest.count > 0 %>
<%= disapprovals.disinterest.count %> did not like the post enough to approve it.
<% end %>
</p>
<% end %>

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

@@ -21,9 +21,7 @@
<p>This post was deleted</p>
<% end %>
<% if post.disapprovals.count > 0 %>
<p><%= render "post_disapprovals/counts", :disapprovals => post.disapprovals %></p>
<% end %>
<%= render "post_disapprovals/counts", :disapprovals => post.disapprovals %>
</div>
<% end %>
@@ -31,12 +29,13 @@
<div class="ui-corner-all ui-state-highlight notice notice-pending" id="pending-approval-notice">
<% if post.is_pending? %>
This post is pending approval.
<%= render "post_disapprovals/counts", :disapprovals => post.disapprovals %>
(<%= link_to "learn more", wiki_pages_path(:title => "about:mod_queue") %>)
<% else %>
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 %>
<% if CurrentUser.can_approve_posts? && !post.disapproved_by?(CurrentUser.user) %>
<div class="quick-mod">
<% unless post.is_status_locked? %>