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

posts/index: update pending BUR notice criteria.

Browse Source 
* Only show pending BUR notice on first page.
* Show pending BUR notice for all searches that include a single tag.
This commit is contained in:
evazion
2020-05-04 01:55:45 -05:00
parent 127bd9866d
commit 6937c40747
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/logical/post_sets/post.rb
View File

@@ -132,8 +132,8 @@ module PostSets
end end
def pending_bulk_update_requests def pending_bulk_update_requests
return BulkUpdateRequest.none unless query.is_simple_tag? return BulkUpdateRequest.none unless tag.present?
@pending_bulk_update_requests ||= BulkUpdateRequest.pending.where_array_includes_any(:tags, query.tags.first.name) @pending_bulk_update_requests ||= BulkUpdateRequest.pending.where_array_includes_any(:tags, tag.name)
end end
end end
end end

2
app/views/posts/partials/index/_posts.html.erb
View File

@@ -19,7 +19,7 @@
</div> </div>
<% end %> <% end %>
<% if CurrentUser.user.is_member? && post_set.query.is_simple_tag? %> <% if CurrentUser.user.is_member? && post_set.tag.present? && post_set.current_page == 1 %>
<% cache("tag-change-notice:#{post_set.query.normalize_query}", expires_in: 4.hours) do %> <% cache("tag-change-notice:#{post_set.query.normalize_query}", expires_in: 4.hours) do %>
<% if post_set.pending_bulk_update_requests.present? %> <% if post_set.pending_bulk_update_requests.present? %>
<div class="fineprint tag-change-notice"> <div class="fineprint tag-change-notice">