Skip to content

Commit 062f0ab

Browse files
authored
Merge pull request #3333 from projectblacklight/deprecate-sidebar-partial
Deprecate render_document_sidebar_partial and catalog/show_sidebar pa…
2 parents 6ddb0ec + a1f8edf commit 062f0ab

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

app/helpers/blacklight/document_helper_behavior.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ def document_class_prefix
3535
def render_document_sidebar_partial(document)
3636
render 'show_sidebar', document: document
3737
end
38+
Blacklight.deprecation.deprecate_methods(self,
39+
render_document_sidebar_partial: 'has been replaced by calling the sidebar component (Blacklight::Search::SidebarComponent) directly. ' \
40+
'Set sidebar_component in the view config.')
3841

3942
##
4043
# return the Bookmarks on a set of documents (all bookmarks on the page)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
<% Blacklight.deprecation.warn('The partial catalog/_show_sidebar.html.erb will be removed in Blacklight 9.0. Configure blacklight_config.show.sidebar_component instead (default Blacklight::Search::SidebarComponent).') unless local_assigns[:silence_deprecation] %>
12
<% presenter = document_presenter(document) %>
23
<%= render presenter.view_config.sidebar_component.new(presenter: presenter) %>

app/views/catalog/show.html.erb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<%= render 'show_main_content' %>
22

33
<% content_for(:sidebar) do %>
4-
<%= render_document_sidebar_partial @document %>
4+
<% presenter = document_presenter(@document) %>
5+
<%= render presenter.view_config.sidebar_component.new(presenter: presenter) %>
56
<% end %>

spec/views/catalog/show.html.erb_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
before do
99
allow(presenter).to receive(:html_title).and_return('Heading')
10+
allow(document).to receive(:more_like_this).and_return([])
1011
allow(view).to receive_messages(has_user_authentication_provider?: false)
11-
allow(view).to receive_messages(render_document_sidebar_partial: "Sidebar")
1212
allow(view).to receive_messages(current_search_session: nil, search_session: {})
1313
assign :document, document
1414
allow(view).to receive_messages(document_presenter: presenter, action_name: 'show', blacklight_config: blacklight_config)

0 commit comments

Comments
 (0)