Skip to content
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.

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

🧹 Restore <%= render... #954

Merged
merged 1 commit into from
Dec 18, 2023
Merged
Changes from all commits
Commits
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
🧹 Restore <%= render...
Prior to this commit, we had a case where `<% render` was called.  The
result would be that we would in fact not render the results.

In the [file from PR 930][1] the render moved from `<%= render` to `<%
render`

With this commit, we restore that rendering.

Related to:

- #930
- #911

[1]: https://github.com/scientist-softserv/palni-palci/pull/930/files#diff-521d4c52bd51d0f13962e2d0b09d2740a257187d4fbf7b1fd8cff53e36b1362e
  • Loading branch information
jeremyf committed Dec 18, 2023
commit 851bf9ddf3c1e70a55900f38608f54b1852e57b3
4 changes: 2 additions & 2 deletions app/views/themes/cultural_show/hyrax/base/show.html.erb
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
</div>
<% end %>
<% end %>
<div class="<%= @presenter.viewer? ? 'col-sm-8' : 'col-sm-8' %>">
<div class="col-sm-8">
<%= render 'work_description', presenter: @presenter %>
<%= render 'metadata', presenter: @presenter %>
</div>
@@ -55,4 +55,4 @@
</div>
</div>
</div>
</div>
</div>
6 changes: 3 additions & 3 deletions app/views/themes/scholarly_show/hyrax/base/show.html.erb
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<%= render 'video_embed_viewer', presenter: @presenter %>
<div class="col-sm-12">
<div class="image-show-description">
<% render 'work_description', presenter: @presenter %>
<%= render 'work_description', presenter: @presenter %>
</div>
</div>
<% elsif @presenter.iiif_viewer? %>
@@ -29,7 +29,7 @@
</div>
<div class="col-sm-12">
<div class="image-show-description">
<% render 'work_description', presenter: @presenter %>
<%= render 'work_description', presenter: @presenter %>
</div>
</div>
<% elsif @presenter.show_pdf_viewer? %>
@@ -41,7 +41,7 @@
<%= render 'representative_media', presenter: @presenter, viewer: false %>
</div>
<div class="col-sm-9">
<% render 'work_description', presenter: @presenter %>
<%= render 'work_description', presenter: @presenter %>
</div>
<% end %>
</div>