Skip to content

Avoid rendering partials on the embed component #3368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jcoyne wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Avoid rendering partials on the embed component #3368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/components/spotlight/solr_document_legacy_embed_component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<% if body.present? %>
<%= body %>
<% elsif partials? %>
<% partials.each do |partial| %>
<%= partial %>
<% end %>
<% elsif embed? %>
<%= embed %>
<% elsif thumbnail? %>
Expand Down
4 changes: 2 additions & 2 deletions app/models/spotlight/blacklight_configuration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ def blacklight_config
config.default_per_page = default_per_page if default_per_page

config.view.embed!
# This is blacklight-gallery's openseadragon partial
# This is blacklight-gallery's openseadragon component
unless config.view.embed.document_component
config.view.embed.partials ||= ['openseadragon']
config.view.embed.document_component = Spotlight::SolrDocumentLegacyEmbedComponent
config.view.embed.embed_component = Blacklight::Gallery::OpenseadragonEmbedComponent
end
config.view.embed.if = false

Expand Down
6 changes: 1 addition & 5 deletions app/views/spotlight/sir_trevor/blocks/_embedded_document.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<div class="box" data-id="<%= document.id %>">
<% view_config = blacklight_config.view_config(:embed) %>
<%= render (view_config.document_component || Spotlight::SolrDocumentLegacyEmbedComponent).new((Blacklight.version > '8.0' ? :document : :presenter) => document_presenter(document, view_config: view_config), counter: nil, block: local_assigns[:block]) do |component| %>
<% component.with_partial do %>
<%= render_document_partials document, view_config.partials, component: component, document_counter: nil, view_config: view_config, block: local_assigns[:block], **(view_config.locals) %>
<% end if view_config&.partials&.any? %>
<% end %>
<%= render (view_config.document_component || Spotlight::SolrDocumentLegacyEmbedComponent).new((Blacklight.version > '8.0' ? :document : :presenter) => document_presenter(document, view_config: view_config), counter: nil, block: local_assigns[:block]) %>
</div>