Merge remote-tracking branch 'upstream/pull/5273'

[rails.git] / app / views / browse / _relation.html.erb

diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb
index c513ea6d1eba6fd666dfea5c017e268341ec4513..5dcdffa47f6cc683d657fa8ad215adf546234c7f 100644 (file)
--- a/app/views/browse/_relation.html.erb
+++ b/app/views/browse/_relation.html.erb
@@ -1,4 +1,4 @@
-<% if relation.redacted? %>
+<% if relation.redacted? && !params[:show_redactions] %>

   <div class="browse-section browse-redacted">
     <%= t "browse.redacted.message_html",
           :type => t("browse.redacted.type.relation"),
   <div class="browse-section browse-redacted">
     <%= t "browse.redacted.message_html",
           :type => t("browse.redacted.type.relation"),


@@ -7,7 +7,7 @@
                                        :id => relation.redaction.id), relation.redaction) %>
   </div>
 <% else %>
                                        :id => relation.redaction.id), relation.redaction) %>
   </div>
 <% else %>

-  <div class="browse-section browse-relation">
+  <%= tag.div :class => ["browse-section", "browse-relation", { "text-body-secondary" => relation.redacted? }] do %>

     <%= render :partial => "browse/common_details", :object => relation %>
 
     <% unless relation.containing_relation_members.empty? %>
     <%= render :partial => "browse/common_details", :object => relation %>
 
     <% unless relation.containing_relation_members.empty? %>


@@ -15,7 +15,7 @@
       <details <%= "open" if relation.containing_relation_members.count < 10 %>>
         <summary><%= t "browse.part_of_relations", :count => relation.containing_relation_members.uniq.count %></summary>
         <ul class="list-unstyled">
       <details <%= "open" if relation.containing_relation_members.count < 10 %>>
         <summary><%= t "browse.part_of_relations", :count => relation.containing_relation_members.uniq.count %></summary>
         <ul class="list-unstyled">

-          <%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %>
+          <%= render :partial => "browse/containing_relation", :collection => relation.containing_relation_members.uniq %>

         </ul>
       </details>
     <% end %>
         </ul>
       </details>
     <% end %>


@@ -29,5 +29,5 @@
         </ul>
       </details>
     <% end %>
         </ul>
       </details>
     <% end %>

-  </div>
+  <% end %>

 <% end %>
 <% end %>