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

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

diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb
index b3cb90cec2aa4a7d05b705c1c2745b6f59237a23..2547ff7aa6a7cbcae116c43300b68bfc3c30c045 100644 (file)
--- a/app/views/browse/_containing_relation.html.erb
+++ b/app/views/browse/_containing_relation.html.erb
@@ -1,7 +1,7 @@
-<li><%= linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s
+<li><%= linked_name = link_to printable_element_name(containing_relation.relation), :action => "relation", :id => containing_relation.relation.id.to_s

         if containing_relation.member_role.blank?
         if containing_relation.member_role.blank?

-          raw t ".entry", :relation_name => linked_name
+          t ".entry_html", :relation_name => linked_name

         else
         else

-          raw t ".entry_role", :relation_name => linked_name, :relation_role => h(containing_relation.member_role)
+          t ".entry_role_html", :relation_name => linked_name, :relation_role => containing_relation.member_role

         end %>
 </li>
         end %>
 </li>