X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d0fce657daf5b12744538f8364faf7c6d352f280..834dff7e81a3b9b616b35510a2e1b15abc8b42c7:/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 953b6665bf..f24cdb7a9b 100644 --- a/apps/workbench/app/helpers/application_helper.rb +++ b/apps/workbench/app/helpers/application_helper.rb @@ -15,6 +15,24 @@ module ApplicationHelper raw RedCloth.new(markup).to_html end + def human_readable_time_html t + begin + t = Time.parse(t) unless t.is_a? Time + rescue + return '' + end + now = Time.now + delta = (now - t).abs + if delta < 12.hours + t.strftime('%I:%M%P').downcase.sub(/^0/,'') + elsif (delta < 2.months and now>t) or t.strftime('%Y')==now.strftime('%Y') + # recent, or this year (hopefully unambiguous in context) + t.strftime('%b %d').sub(/ 0/,' ') + else + t.strftime('%b %d, %Y').sub(/ 0/,' ') + end + end + def human_readable_bytes_html(n) return h(n) unless n.is_a? Fixnum @@ -38,7 +56,7 @@ module ApplicationHelper end return h(n) - #raw = n.to_s + #raw = n.to_s #cooked = '' #while raw.length > 3 # cooked = ',' + raw[-3..-1] + cooked @@ -51,6 +69,31 @@ module ApplicationHelper ArvadosBase::resource_class_for_uuid(attrvalue, opts) end + ## + # Returns HTML that links to the Arvados object specified in +attrvalue+ + # Provides various output control and styling options. + # + # +attrvalue+ an Arvados model object or uuid + # + # +opts+ a set of flags to control output: + # + # [:link_text] the link text to use (may include HTML), overrides everything else + # + # [:friendly_name] whether to use the "friendly" name in the link text (by + # calling #friendly_link_name on the object), otherwise use the uuid + # + # [:with_class_name] prefix the link text with the class name of the model + # + # [:no_tags] disable tags in the link text (default is to show tags). + # Currently tags are only shown for Collections. + # + # [:thumbnail] if the object is a collection, show an image thumbnail if the + # collection consists of a single image file. + # + # [:no_link] don't create a link, just return the link text + # + # +style_opts+ additional HTML properties for the anchor tag, passed to link_to + # def link_to_if_arvados_object(attrvalue, opts={}, style_opts={}) if (resource_class = resource_class_for_uuid(attrvalue, opts)) link_uuid = attrvalue.is_a?(ArvadosBase) ? attrvalue.uuid : attrvalue @@ -58,7 +101,9 @@ module ApplicationHelper if !link_name link_name = link_uuid - if opts[:friendly_name] + if opts[:name_link] + link_name = opts[:name_link].name + elsif opts[:friendly_name] if attrvalue.respond_to? :friendly_link_name link_name = attrvalue.friendly_link_name else @@ -73,11 +118,22 @@ module ApplicationHelper if opts[:with_class_name] link_name = "#{resource_class.to_s}: #{link_name}" end - if !opts[:no_tags] and resource_class == Collection + if !opts[:name_link] and + !opts[:no_tags] and + resource_class == Collection Link.where(head_uuid: link_uuid, link_class: ["tag", "identifier"]).each do |tag| link_name += ' ' + html_escape(tag.name) + '' end end + if opts[:thumbnail] and resource_class == Collection + # add an image thumbnail if the collection consists of a single image file. + Collection.where(uuid: link_uuid).each do |c| + if c.files.length == 1 and CollectionsHelper::is_image c.files.first[1] + link_name += " " + link_name += image_tag "#{url_for c}/#{CollectionsHelper::file_path c.files.first}", style: "height: 4em; width: auto" + end + end + end end style_opts[:class] = (style_opts[:class] || '') + ' nowrap' if opts[:no_link] @@ -86,6 +142,7 @@ module ApplicationHelper link_to raw(link_name), { controller: resource_class.to_s.tableize, action: 'show', id: link_uuid }, style_opts end else + # just return attrvalue if it is not recognizable as an Arvados object or uuid. attrvalue end end @@ -106,16 +163,29 @@ module ApplicationHelper attrvalue = attrvalue.to_json if attrvalue.is_a? Hash or attrvalue.is_a? Array - link_to attrvalue.to_s, '#', { + ajax_options = { + "data-pk" => { + id: object.uuid, + key: object.class.to_s.underscore + } + } + if object.uuid + ajax_options['data-url'] = url_for(action: "update", id: object.uuid, controller: object.class.to_s.pluralize.underscore) + else + ajax_options['data-url'] = url_for(action: "create", controller: object.class.to_s.pluralize.underscore) + ajax_options['data-pk'][:defaults] = object.attributes + end + ajax_options['data-pk'] = ajax_options['data-pk'].to_json + + content_tag 'span', attrvalue.to_s, { "data-emptytext" => "none", "data-placement" => "bottom", "data-type" => input_type, - "data-url" => url_for(action: "update", id: object.uuid, controller: object.class.to_s.pluralize.underscore), "data-title" => "Update #{attr.gsub '_', ' '}", "data-name" => attr, - "data-pk" => "{id: \"#{object.uuid}\", key: \"#{object.class.to_s.underscore}\"}", + "data-object-uuid" => object.uuid, :class => "editable" - }.merge(htmloptions) + }.merge(htmloptions).merge(ajax_options) end def render_pipeline_component_attribute(object, attr, subattr, value_info, htmloptions={}) @@ -183,27 +253,27 @@ module ApplicationHelper dn += '[value]' end - items = [] + selectables = [] attrtext = attrvalue if dataclass and dataclass.is_a? Class if attrvalue and !attrvalue.empty? Link.where(head_uuid: attrvalue, link_class: ["tag", "identifier"]).each do |tag| attrtext += " [#{tag.name}]" end - items.append({name: attrtext, uuid: attrvalue, type: dataclass.to_s}) + selectables.append({name: attrtext, uuid: attrvalue, type: dataclass.to_s}) end #dataclass.where(uuid: attrvalue).each do |item| - # items.append({name: item.uuid, uuid: item.uuid, type: dataclass.to_s}) + # selectables.append({name: item.uuid, uuid: item.uuid, type: dataclass.to_s}) #end itemuuids = [] dataclass.limit(10).each do |item| itemuuids << item.uuid - items.append({name: item.uuid, uuid: item.uuid, type: dataclass.to_s}) + selectables.append({name: item.uuid, uuid: item.uuid, type: dataclass.to_s}) end Link.where(head_uuid: itemuuids, link_class: ["tag", "identifier"]).each do |tag| - items.each do |item| - if item.uuid == tag.head_uuid - item.name += ' [' + tag.name + ']' + selectables.each do |selectable| + if selectable['uuid'] == tag.head_uuid + selectable['name'] += ' [' + tag.name + ']' end end end @@ -224,9 +294,9 @@ module ApplicationHelper }.merge(htmloptions) lt += raw("\n