X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/71ebe5f5239249e9739f570260d9b6aa2d2134ac..257d60253246952b435cea23b1912af80ea2c6d6:/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 2d1aca645e..a37ecda704 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -222,7 +222,10 @@ module ApplicationHelper
return_value
end
- def render_editable_attribute(object, attr, attrvalue=nil, htmloptions={})
+ # Render an editable attribute with the attrvalue of the attr.
+ # The htmloptions are added to the editable element's list of attributes.
+ # The nonhtml_options are only used to customize the display of the element.
+ def render_editable_attribute(object, attr, attrvalue=nil, htmloptions={}, nonhtml_options={})
attrvalue = object.send(attr) if attrvalue.nil?
if not object.attribute_editable?(attr)
if attrvalue && attrvalue.length > 0
@@ -278,11 +281,11 @@ module ApplicationHelper
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('' + (htmloptions[:btntext] || '') + '')
+ edit_button = raw('' + (nonhtml_options[:btntext] || '') + '')
- if htmloptions[:btnplacement] == :left
+ if nonhtml_options[:btnplacement] == :left
edit_button + ' ' + span_tag
- elsif htmloptions[:btnplacement] == :top
+ elsif nonhtml_options[:btnplacement] == :top
edit_button + raw('
') + span_tag
else
span_tag + ' ' + edit_button
@@ -495,6 +498,10 @@ module ApplicationHelper
raw("#{date}")
end
+ def render_time duration, use_words, round_to_min=true
+ render_runtime duration, use_words, round_to_min
+ end
+
private
def is_textile?( object, attr )
is_textile = object.textile_attributes.andand.include?(attr)