Merge branch '3342-pipeline-output-current-project' closes #3342

[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 de7fd17c09c6b0100dec2ce26589c74b0fa2d190..edcb7fbe85b026257f8ec1688df1b770598decef 100644 (file)
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -87,6 +87,7 @@ module ApplicationHelper
         link_uuid = attrvalue
       end
       link_name = opts[:link_text]
+      tags = ""
       if !link_name
         link_name = object.andand.default_name || resource_class.default_name
 
@@ -106,13 +107,18 @@ module ApplicationHelper
             end
           end
         end
+        if link_name.nil? or link_name.empty?
+          link_name = attrvalue
+        end
         if opts[:with_class_name]
           link_name = "#{resource_class.to_s}: #{link_name}"
         end
         if !opts[:no_tags] and resource_class == Collection
           links_for_object(link_uuid).each do |tag|
             if tag.link_class.in? ["tag", "identifier"]
-              link_name += ' <span class="label label-info">' + html_escape(tag.name) + '</span>'
+              tags += ' <span class="label label-info">'
+              tags += link_to tag.name, controller: "links", filters: [["link_class", "=", "tag"], ["name", "=", tag.name]].to_json
+              tags += '</span>'
             end
           end
         end
@@ -130,11 +136,15 @@ module ApplicationHelper
       if opts[:no_link]
         raw(link_name)
       else
-        link_to raw(link_name), { controller: resource_class.to_s.tableize, action: 'show', id: ((opts[:name_link].andand.uuid) || link_uuid) }, style_opts
+        (link_to raw(link_name), { controller: resource_class.to_s.tableize, action: 'show', id: ((opts[:name_link].andand.uuid) || link_uuid) }, style_opts) + raw(tags)
       end
     else
       # just return attrvalue if it is not recognizable as an Arvados object or uuid.
-      attrvalue
+      if attrvalue.nil? or (attrvalue.is_a? String and attrvalue.empty?)
+        "(none)"
+      else
+        attrvalue
+      end
     end
   end
 
@@ -181,10 +191,10 @@ module ApplicationHelper
     span_id = object.uuid.to_s + '-' + attr.to_s + '-' + (@unique_id += 1).to_s
 
     span_tag = content_tag 'span', rendervalue, {
-      "data-emptytext" => (object.andand.default_name || 'none'),
+      "data-emptytext" => '(none)',
       "data-placement" => "bottom",
       "data-type" => input_type,
-      "data-title" => "Edit #{attr.gsub '_', ' '}",
+      "data-title" => "Edit #{attr.to_s.gsub '_', ' '}",
       "data-name" => attr,
       "data-object-uuid" => object.uuid,
       "data-toggle" => "manual",
@@ -228,6 +238,7 @@ module ApplicationHelper
       else
         attrvalue = ''
       end
+      preconfigured_search_str = value_info[:search_for]
     end
 
     if !object or
@@ -276,7 +287,7 @@ module ApplicationHelper
          action_name: 'OK',
          action_href: pipeline_instance_path(id: object.uuid),
          action_method: 'patch',
-         preconfigured_search_str: "#{value_info[:search_for]}",
+         preconfigured_search_str: (preconfigured_search_str || ""),
          action_data: {
            merge: true,
            selection_param: selection_param,