X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a2b994514a6743a055116f9362c303db66f480b5..a32c4f9997a0c8941b62668c5e59941985359c05:/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 c8c4ccc1a9..f1502afee1 100644 --- a/apps/workbench/app/helpers/application_helper.rb +++ b/apps/workbench/app/helpers/application_helper.rb @@ -307,64 +307,17 @@ module ApplicationHelper end end - if dataclass.andand.is_a?(Class) - datatype = 'select' - elsif dataclass == 'number' - datatype = 'number' - elsif attrvalue.is_a? Array - # TODO: find a way to edit arrays with x-editable - return attrvalue - elsif attrvalue.is_a? Fixnum or attrvalue.is_a? Float + if dataclass == 'number' or attrvalue.is_a? Fixnum or attrvalue.is_a? Float datatype = 'number' elsif attrvalue.is_a? String datatype = 'text' + elsif attrvalue.is_a?(Array) or dataclass.andand.is_a?(Class) + # TODO: find a way to edit with x-editable + return attrvalue end - # preload data - preload_uuids = [] - items = [] - selectables = [] - - attrtext = attrvalue - if dataclass.is_a? Class and dataclass < ArvadosBase - objects = get_n_objects_of_class dataclass, 10 - objects.each do |item| - items << item - preload_uuids << item.uuid - end - if attrvalue and !attrvalue.empty? - preload_uuids << attrvalue - end - preload_links_for_objects preload_uuids - - if attrvalue and !attrvalue.empty? - links_for_object(attrvalue).each do |link| - if link.link_class.in? ["tag", "identifier"] - attrtext += " [#{link.name}]" - end - end - selectables.append({name: attrtext, uuid: attrvalue, type: dataclass.to_s}) - end - itemuuids = [] - items.each do |item| - itemuuids << item.uuid - selectables.append({name: item.uuid, uuid: item.uuid, type: dataclass.to_s}) - end - - itemuuids.each do |itemuuid| - links_for_object(itemuuid).each do |link| - if link.link_class.in? ["tag", "identifier"] - selectables.each do |selectable| - if selectable['uuid'] == link.head_uuid - selectable['name'] += ' [' + link.name + ']' - end - end - end - end - end - end - - lt = link_to attrtext, '#', { + # When datatype is a String or Fixnum, link_to the attrvalue + lt = link_to attrvalue, '#', { "data-emptytext" => "none", "data-placement" => "bottom", "data-type" => datatype, @@ -379,16 +332,6 @@ module ApplicationHelper :id => id }.merge(htmloptions) - lt += raw("\n") - lt end