X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1c45ed6a43b01a4f216cf8877b35d9ad18e1c5b5..56d21dc3d5823117729df3db6186da96f277b328:/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 d6b258be61..d844350927 100644 --- a/apps/workbench/app/helpers/application_helper.rb +++ b/apps/workbench/app/helpers/application_helper.rb @@ -17,6 +17,7 @@ module ApplicationHelper def human_readable_bytes_html(n) return h(n) unless n.is_a? Fixnum + return "0 bytes" if (n == 0) orders = { 1 => "bytes", @@ -152,16 +153,16 @@ module ApplicationHelper else ajax_options['data-url'] = url_for(action: "create", controller: object.class.to_s.pluralize.underscore) ajax_options['data-pk'][:defaults] = object.attributes - ajax_options['data-pk'][:_method] = 'post' end ajax_options['data-pk'] = ajax_options['data-pk'].to_json - link_to attrvalue.to_s, '#', { + content_tag 'span', attrvalue.to_s, { "data-emptytext" => "none", "data-placement" => "bottom", "data-type" => input_type, "data-title" => "Update #{attr.gsub '_', ' '}", "data-name" => attr, + "data-object-uuid" => object.uuid, :class => "editable" }.merge(htmloptions).merge(ajax_options) end @@ -267,7 +268,7 @@ module ApplicationHelper "data-pk" => "{id: \"#{object.uuid}\", key: \"#{object.class.to_s.underscore}\"}", "data-showbuttons" => "false", "data-value" => attrvalue, - :class => "editable #{'required' if required}", + :class => "editable #{'required' if required} form-control", :id => id }.merge(htmloptions) @@ -277,10 +278,22 @@ module ApplicationHelper lt += raw("add_form_selection_sources(#{selectables.to_json});\n") end - lt += raw("$('##{id}').editable({source: function() { return select_form_sources('#{dataclass}'); } });\n") + lt += raw("$('[data-name=\"#{dn}\"]').editable({source: function() { return select_form_sources('#{dataclass}'); } });\n") lt += raw("") lt end + + def render_arvados_object_list_start(list, button_text, button_href, + params={}, *rest, &block) + show_max = params.delete(:show_max) || 3 + params[:class] ||= 'btn btn-xs btn-default' + list[0...show_max].each { |item| yield item } + unless list[show_max].nil? + link_to(h(button_text) + + raw('   '), + button_href, params, *rest) + end + end end