From 2956c6524a088c1a0d783b74ee335df6e93ec885 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Fri, 6 May 2022 10:18:01 -0500 Subject: [PATCH 1/2] Remove the _previous_next_doc.html.erb partial Complaints have been made about how challenging it is to follow program execution through various partials, helpers and components. I identified that the _previous_next_doc.html.erb partial does nothing but render a component. We can remove this partial and make it easier for people reading the code to follow the control flow. --- app/views/catalog/_previous_next_doc.html.erb | 1 + app/views/catalog/_show_main_content.html.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/catalog/_previous_next_doc.html.erb b/app/views/catalog/_previous_next_doc.html.erb index a4fc0ba770..6280d7409c 100644 --- a/app/views/catalog/_previous_next_doc.html.erb +++ b/app/views/catalog/_previous_next_doc.html.erb @@ -1 +1,2 @@ +<% Deprecation.warn(self, 'Deprecated partial _previous_next_doc.html.erb has been called. This functionality has been folded into _show_main_content.html.erb') <%= render(Blacklight::SearchContextComponent.new(search_context: @search_context, search_session: search_session)) %> diff --git a/app/views/catalog/_show_main_content.html.erb b/app/views/catalog/_show_main_content.html.erb index 86c516af34..aa26aea16b 100644 --- a/app/views/catalog/_show_main_content.html.erb +++ b/app/views/catalog/_show_main_content.html.erb @@ -1,4 +1,4 @@ -<%= render 'previous_next_doc' if @search_context && search_session['document_id'] == @document.id %> +<%= render(Blacklight::SearchContextComponent.new(search_context: @search_context, search_session: search_session)) if search_session['document_id'] == @document.id %> <% @page_title = t('blacklight.search.show.title', document_title: document_presenter(@document).html_title, application_name: application_name).html_safe %> <% content_for(:head) { render_link_rel_alternates } %> From 0e2d5fb259de7b1ab0cd7add0b9a1674632f1e49 Mon Sep 17 00:00:00 2001 From: Benjamin Armintor Date: Sat, 7 May 2022 12:56:35 -0400 Subject: [PATCH 2/2] remove deprecated _previous_next_doc partial --- app/views/catalog/_previous_next_doc.html.erb | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 app/views/catalog/_previous_next_doc.html.erb diff --git a/app/views/catalog/_previous_next_doc.html.erb b/app/views/catalog/_previous_next_doc.html.erb deleted file mode 100644 index 6280d7409c..0000000000 --- a/app/views/catalog/_previous_next_doc.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -<% Deprecation.warn(self, 'Deprecated partial _previous_next_doc.html.erb has been called. This functionality has been folded into _show_main_content.html.erb') -<%= render(Blacklight::SearchContextComponent.new(search_context: @search_context, search_session: search_session)) %>