Merge branch 'master' of git.clinicalfuture.com:arvados

[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 4b34886472c2205cdbc3a14ea3b1d059d2aec925..a42016b8eca0cc4a70ead39b1dbc4ff07cf0bb23 100644 (file)
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -54,18 +54,19 @@ module ApplicationHelper
       if !link_name
         link_name = link_uuid
 
-        if opts[:friendly_name] and resource_class.column_names.include? "name" and resource_class.find(link_uuid).name != nil and not resource_class.find(link_uuid).name.empty?
-          link_name = "#{resource_class.to_s} #{resource_class.find(link_uuid).name}"
-        elsif opts[:friendly_name] and resource_class.column_names.include? "hostname" and resource_class.find(link_uuid).hostname != nil and not resource_class.find(link_uuid).hostname.empty?
-          link_name = "#{resource_class.to_s} #{resource_class.find(link_uuid).hostname}"
-        elsif opts[:friendly_name] and resource_class.column_names.include? "first_name"
-          link_name = "#{resource_class.to_s} #{resource_class.find(link_uuid).first_name} #{resource_class.find(link_uuid).last_name}"
-        else
-          if opts[:with_class_name]
-            link_name = "#{resource_class.to_s} #{link_name}"
+        if opts[:friendly_name]
+          begin
+            link_name = resource_class.find(link_uuid).friendly_link_name
+          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}"
+        end
       end
+      style_opts[:class] = (style_opts[:class] || '') + ' nowrap'
       link_to link_name, { controller: resource_class.to_s.underscore.pluralize, action: 'show', id: link_uuid }, style_opts
     else
       attrvalue