Merge branch 'master' into 1977-provenance-report

[arvados.git] / apps / workbench / app / helpers / application_helper.rb

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 37601090f2c7693e04733a4e01164f0b4572ec02..55009385874ee0f2ea6e587ff34b5f8e539e2921 100644 (file)
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -53,8 +53,20 @@ module ApplicationHelper
       link_name = opts[:link_text]
       if !link_name
         link_name = link_uuid
+
+        if opts[:friendly_name]
+          begin
+            friendly_name = resource_class.find(link_uuid).friendly_link_name
+            if friendly_name and not friendly_name.empty?
+              link_name = friendly_name
+            end
+          rescue RuntimeError
+            # If that lookup failed, the link will too. So don't make one.
+            return attrvalue
+          end
+        end
         if opts[:with_class_name]
-          link_name = "#{resource_class.to_s} #{link_name}"
+          link_name = "#{resource_class.to_s}: #{link_name}"
         end
       end
       link_to link_name, { controller: resource_class.to_s.underscore.pluralize, action: 'show', id: link_uuid }, style_opts