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

[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 ba05c1fe427471e805464e210fe4719df3921746..febb3e129fcbdd4575a80cc4d024cab458415b42 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), containing_relation.relation

         if containing_relation.member_role.blank?
           t ".entry_html", :relation_name => linked_name
         else
         if containing_relation.member_role.blank?
           t ".entry_html", :relation_name => linked_name
         else

-          t ".entry_role_html", :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>