X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2c447c25f810b52e986649a3f4138c671d066092..8a504ad561c1ffbafee8a7bc8da551f9d4b9a29e:/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 a6e6316013..ef2830cd7e 100644 --- a/apps/workbench/app/helpers/application_helper.rb +++ b/apps/workbench/app/helpers/application_helper.rb @@ -133,7 +133,7 @@ module ApplicationHelper end end style_opts[:class] = (style_opts[:class] || '') + ' nowrap' - if opts[:no_link] or (resource_class == User && !current_user.is_active) + if opts[:no_link] or (resource_class == User && !current_user) 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) + raw(tags) @@ -307,9 +307,7 @@ module ApplicationHelper end end - if dataclass == 'number' or attrvalue.is_a? Fixnum or attrvalue.is_a? Float - datatype = 'number' - elsif attrvalue.is_a? String + if 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