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

[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 cf9c62b133951943b209759a9973fac338b4f841..a987fe4d8e179bdedd701197e80e1a8c22a45302 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,15 +7,15 @@
                                        :id => relation.redaction.id), relation.redaction) %>
   </div>
 <% else %>
                                        :id => relation.redaction.id), relation.redaction) %>
   </div>
 <% else %>

-  <div class="browse-section browse-relation">
-    <%= render :partial => "common_details", :object => relation %>
+  <%= tag.div :class => ["browse-section", "browse-relation", { "text-muted" => relation.redacted? }] do %>
+    <%= render :partial => "browse/common_details", :object => relation %>

 
     <% unless relation.containing_relation_members.empty? %>
       <h4><%= t "browse.part_of" %></h4>
       <details <%= "open" if relation.containing_relation_members.count < 10 %>>
 
     <% unless relation.containing_relation_members.empty? %>
       <h4><%= t "browse.part_of" %></h4>
       <details <%= "open" if relation.containing_relation_members.count < 10 %>>

-        <summary><%= t "browse.part_of_relations", :count => relation.containing_relation_members.count %></summary>
+        <summary><%= t "browse.part_of_relations", :count => relation.containing_relation_members.uniq.count %></summary>

         <ul class="list-unstyled">
         <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 %>


@@ -25,9 +25,9 @@
       <details <%= "open" if relation.relation_members.count < 10 %>>
         <summary><%= t ".members_count", :count => relation.relation_members.count %></summary>
         <ul class="list-unstyled">
       <details <%= "open" if relation.relation_members.count < 10 %>>
         <summary><%= t ".members_count", :count => relation.relation_members.count %></summary>
         <ul class="list-unstyled">

-          <%= render :partial => "relation_member", :collection => relation.relation_members %>
+          <%= render :partial => "browse/relation_member", :collection => relation.relation_members %>

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

-  </div>
+  <% end %>

 <% end %>
 <% end %>