From 728bb382abe54a21d91aebed9cdedfaceb3ef72b Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 2 Jul 2021 17:58:49 -0700 Subject: [PATCH] reuse tags query in docs table --- app/views/content/list/_document_table.html.erb | 11 +++++++++-- app/views/documents/index.html.erb | 3 ++- app/views/folders/show.html.erb | 9 ++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/views/content/list/_document_table.html.erb b/app/views/content/list/_document_table.html.erb index b65cb91a..6fe02ec2 100644 --- a/app/views/content/list/_document_table.html.erb +++ b/app/views/content/list/_document_table.html.erb @@ -1,4 +1,12 @@ -<%# Usage: render partial: 'content/list/document_table', locals: { content_list: @content, content_type: @content_type_class } %> +<%# + Usage: + render partial: 'content/list/document_table', locals: { + content_list: @documents, + content_type: Document, + folders: @folders.pluck(:title, :id), + tags: PageTag.where(page_type: 'Document', page_id: @documents.pluck(:id)) + } +%> <% if content_list.any? %>
@@ -291,7 +299,6 @@ <%= number_with_delimiter total_word_count %> <%= 'word'.pluralize(total_word_count) %> - <% tags = PageTag.where(page_type: 'Document', page_id: content_list) %> <% if tags.any? %>

  • diff --git a/app/views/documents/index.html.erb b/app/views/documents/index.html.erb index f965b541..81e84a49 100644 --- a/app/views/documents/index.html.erb +++ b/app/views/documents/index.html.erb @@ -27,7 +27,8 @@ render partial: 'content/list/document_table', locals: { content_list: @documents, content_type: Document, - folders: @folders.pluck(:title, :id) + folders: @folders.pluck(:title, :id), + tags: PageTag.where(page_type: 'Document', page_id: @documents.pluck(:id)) } %> <%# render partial: 'notice_dismissal/messages/02' %> diff --git a/app/views/folders/show.html.erb b/app/views/folders/show.html.erb index e3f32ccd..ff39d0bf 100644 --- a/app/views/folders/show.html.erb +++ b/app/views/folders/show.html.erb @@ -33,7 +33,14 @@
    Documents <%= @content.count %>
    <%= render partial: 'content/components/list_filter_bar', locals: { content_type: Document } if @content.any? %> - <%= render partial: 'content/list/document_table', locals: { content_list: @content, content_type: Document, folders: @all_folders.pluck(:title, :id) } %> + <%= + render partial: 'content/list/document_table', locals: { + content_list: @content, + content_type: Document, + folders: @all_folders.pluck(:title, :id), + tags: PageTag.where(page_type: 'Document', page_id: @content.pluck(:id)) + } + %>
  • <% end %>