X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a11c56ef66604a9117e3db8c2fa2273c98f88b51..9daf42fbdb868939653c6e3ca8a4fffd1cf94e31:/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 a05e6ba268..b145fddcc9 100644 --- a/apps/workbench/app/helpers/application_helper.rb +++ b/apps/workbench/app/helpers/application_helper.rb @@ -52,6 +52,35 @@ module ApplicationHelper ArvadosBase::resource_class_for_uuid(attrvalue, opts) end + # When using {remote:true}, or using {method:...} to use an HTTP + # method other than GET, move the target URI from href to + # data-remote-href. Otherwise, browsers offer features like "open in + # new window" and "copy link address" which bypass Rails' click + # handler and therefore end up at incorrect/nonexistent routes (by + # ignoring data-method) and expect to receive pages rather than + # javascript responses. + # + # See assets/javascripts/link_to_remote.js for supporting code. + def link_to *args, &block + if (args.last and args.last.is_a? Hash and + (args.last[:remote] or + (args.last[:method] and + args.last[:method].to_s.upcase != 'GET'))) + if Rails.env.test? + # Capybara/phantomjs can't click_link without an href, even if + # the click handler means it never gets used. + raw super.gsub(' href="', ' href="#" data-remote-href="') + else + # Regular browsers work as desired: users can click A elements + # without hrefs, and click handlers fire; but there's no "copy + # link address" option in the right-click menu. + raw super.gsub(' href="', ' data-remote-href="') + end + else + super + end + end + ## # Returns HTML that links to the Arvados object specified in +attrvalue+ # Provides various output control and styling options. @@ -148,6 +177,33 @@ module ApplicationHelper end end + def link_to_arvados_object_if_readable(attrvalue, link_text, link_text_if_not_readable, use_friendly_name=false) + resource_class = resource_class_for_uuid(attrvalue) + if !resource_class + return link_text_if_not_readable + end + + if resource_class.to_s == 'Collection' + if CollectionsHelper.match(attrvalue) + readable = collection_for_pdh(attrvalue).any? + else + readable = collections_for_object(attrvalue).any? + end + else + readable = object_for_dataclass(resource_class, attrvalue) + end + + if readable + if use_friendly_name + link_to_if_arvados_object attrvalue, friendly_name: true + else + link_to_if_arvados_object attrvalue, link_text: link_text + end + else + link_text_if_not_readable + end + end + def render_editable_attribute(object, attr, attrvalue=nil, htmloptions={}) attrvalue = object.send(attr) if attrvalue.nil? if not object.attribute_editable?(attr) @@ -200,7 +256,9 @@ module ApplicationHelper "id" => span_id, :class => "editable #{is_textile?( object, attr ) ? 'editable-textile' : ''}" }.merge(htmloptions).merge(ajax_options) - edit_button = raw('') + edit_tiptitle = 'edit' + edit_tiptitle = 'Warning: do not use hyphens in the repository name as they will be stripped' if (object.class.to_s == 'Repository' and attr == 'name') + edit_button = raw('') if htmloptions[:btnplacement] == :left edit_button + ' ' + span_tag else @@ -307,9 +365,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