Skip to content

Commit 479ca33

Browse files
committed
Avoid rendering partials on the embed component
render_document_partials is deprecated Fixes #3362
1 parent d25e949 commit 479ca33

3 files changed

Lines changed: 8 additions & 10 deletions

File tree

app/components/spotlight/solr_document_legacy_embed_component.html.erb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<% if body.present? %>
22
<%= body %>
3-
<% elsif partials? %>
4-
<% partials.each do |partial| %>
5-
<%= partial %>
6-
<% end %>
73
<% elsif embed? %>
84
<%= embed %>
95
<% elsif thumbnail? %>

app/models/spotlight/blacklight_configuration.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,11 @@ def blacklight_config
121121
config.default_per_page = default_per_page if default_per_page
122122

123123
config.view.embed!
124-
config.view.embed.document_component = Spotlight::SolrDocumentLegacyEmbedComponent unless config.view.embed.document_component
124+
# This is blacklight-gallery's openseadragon component
125+
unless config.view.embed.document_component
126+
config.view.embed.document_component = Spotlight::SolrDocumentLegacyEmbedComponent
127+
config.view.embed.embed_component = Blacklight::Gallery::OpenseadragonEmbedComponent
128+
end
125129
config.view.embed.if = false
126130

127131
# blacklight-gallery requires tile_source_field
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<div class="box" data-id="<%= document.id %>">
22
<% view_config = blacklight_config.view_config(:embed) %>
3-
<%= render (view_config.document_component || Spotlight::SolrDocumentLegacyEmbedComponent).new(document: document_presenter(document, view_config: view_config), counter: nil, block: local_assigns[:block]) do |component| %>
4-
<% component.with_partial do %>
5-
<%= render_document_partials document, view_config.partials, component: component, document_counter: nil, view_config: view_config, block: local_assigns[:block], **(view_config.locals) %>
6-
<% end if Blacklight::VERSION < '9.0' && view_config&.partials&.any? %>
7-
<% end %>
3+
<%= render (view_config.document_component || Spotlight::SolrDocumentLegacyEmbedComponent)
4+
.new((Blacklight.version > '8.0' ? :document : :presenter) => document_presenter(document, view_config: view_config),
5+
counter: nil, block: local_assigns[:block]) %>
86
</div>

0 commit comments

Comments
 (0)