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

Merge pull request #2895 from evazion/fix-modqueue-dtext

Browse Source 
modqueue: link tags, optimize sql, use dtext in disapproval reasons.
This commit is contained in:
Albert Yi
2017-02-27 16:47:19 -08:00
committed by GitHub
parent b332273378 b80976bce7
commit 27a85cd066
7 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/comments/partials/index/_header.html.erb
View File

@@ -24,11 +24,7 @@
</div>
<div class="row list-of-tags">
<strong>Tags</strong>
<% post.tag_array.each do |tag_name| %>
<span class="category-<%= Tag.category_for(tag_name) %>">
<%= link_to(tag_name.tr("_", " "), posts_path(:tags => tag_name)) %>
</span>
<% end %>
<%= post.presenter.inline_tag_list_html(self) %>
</div>
</div>

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

@@ -60,7 +60,7 @@
<strong>Hidden</strong>: <%= render "post_disapprovals/compact_counts", :disapprovals => post.disapprovals, :post => post %>
</li>
<li><strong>Source</strong>: <%= post.source %></li>
<li><strong>Tags</strong>: <%= post.tag_string %></li>
<li><strong>Tags</strong>: <%= post.presenter.inline_tag_list_html(self) %></li>
</ul>
</section>
</div>

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

@@ -1,17 +1,17 @@
<% 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 %>)
<% if CurrentUser.can_approve_posts? || post.created_at < 3.days.ago %>
<% if disapprovals.map(&:reason).grep("breaks_rules").count > 0 %>
(breaks rules: <%= disapprovals.map(&:reason).grep("breaks_rules").count %>)
<% end %>
<% if disapprovals.poor_quality.count > 0 %>
(poor quality: <%= disapprovals.poor_quality.count %>)
<% if disapprovals.map(&:reason).grep("poor_quality").count > 0 %>
(poor quality: <%= disapprovals.map(&:reason).grep("poor_quality").count %>)
<% end %>
<% if disapprovals.disinterest.count > 0 %>
(no interest: <%= disapprovals.disinterest.count %>)
<% if disapprovals.map(&:reason).grep(/disinterest|legacy/).count > 0 %>
(no interest: <%= disapprovals.map(&:reason).grep(/disinterest|legacy/).count %>)
<% end %>
<% if disapprovals.with_message.any? %>
(messages: <%= disapprovals.disinterest.with_message.map(&:message).to_sentence %>)
<% if disapprovals.map(&:message).any?(&:present?) %>
(messages: <%= disapprovals.map(&:message).select(&:present?).map { |msg| format_text(msg, ragel: true, inline: true) }.to_sentence.html_safe %>)
<% end %>
<% end %>
<% end %>

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

@@ -1,21 +1,21 @@
<% if disapprovals.count > 0 && (CurrentUser.can_approve_posts? || post.created_at < 3.days.ago) %>
<% if CurrentUser.can_approve_posts? || post.created_at < 3.days.ago %>
<p>
It has been reviewed by <%= pluralize disapprovals.count, "moderator" %>.
It has been reviewed by <%= pluralize disapprovals.length, "moderator" %>.
<% if disapprovals.breaks_rules.count > 0 %>
<%= disapprovals.breaks_rules.count %> believe it breaks the rules.
<% if disapprovals.map(&:reason).grep("breaks_rules").count > 0 %>
<%= disapprovals.map(&:reason).grep("breaks_rules").count %> believe it breaks the rules.
<% end %>
<% if disapprovals.poor_quality.count > 0 %>
<%= disapprovals.poor_quality.count %> believe it has poor quality.
<% if disapprovals.map(&:reason).grep("poor_quality").count > 0 %>
<%= disapprovals.map(&:reason).grep("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.
<% if disapprovals.map(&:reason).grep(/disinterest|legacy/).count > 0 %>
<%= disapprovals.map(&:reason).grep(/disinterest|legacy/).count %> did not like the post enough to approve it.
<% end %>
<% if disapprovals.with_message.any? %>
Messages: <%= disapprovals.with_message.map(&:message).to_sentence %>
<% if disapprovals.map(&:message).any?(&:present?) %>
Messages: <%= disapprovals.map(&:message).select(&:present?).map { |msg| format_text(msg, ragel: true, inline: true) }.to_sentence.html_safe %>.
<% end %>
</p>
<% end %>
<% end %>