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

fixes #2438: Flagged posts cannot be approved from post page

Browse Source
This commit is contained in:
r888888888
2015-07-15 13:26:01 -07:00
parent 8bb3cef88a
commit 9f8e723d83
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,9 +23,13 @@
</div>
<% end %>
<% if post.is_pending? %>
<% if post.is_pending? || post.is_flagged? %>
<div class="ui-corner-all ui-state-highlight notice notice-pending" id="pending-approval-notice">
This post is pending approval (<%= link_to "learn more", wiki_pages_path(:title => "about:mod_queue") %>)
<% if post.is_pending? %>
This post is pending approval (<%= 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 %>
<% if CurrentUser.can_approve_posts? && !post.disapproved_by?(CurrentUser.user) %>
<div class="quick-mod">

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

@@ -118,11 +118,11 @@
</section>
</div>
<div id="flag-dialog" title="Flag post" style="display: none;">
<div id="flag-dialog" class="prose" title="Flag post" style="display: none;">
<%= render "post_flags/new" %>
</div>
<div id="appeal-dialog" title="Appeal post" style="display: none;">
<div id="appeal-dialog" class="prose" title="Appeal post" style="display: none;">
<%= render "post_appeals/new" %>
</div>