X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9f37a732c9bfb3892231765f37e213af4e037e68..23721458d7ec8c44c4b54f45eb7d2a4e6d7cdce1:/apps/workbench/app/helpers/application_helper.rb?ds=sidebyside
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index cfe7f19187..d02d058e3a 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]
+ 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)
@@ -160,10 +160,10 @@ module ApplicationHelper
end
input_type = 'text'
- case object.class.attribute_info[attr.to_sym].andand[:type]
- when 'text'
+ attrtype = object.class.attribute_info[attr.to_sym].andand[:type]
+ if attrtype == 'text' or attr == 'description'
input_type = 'textarea'
- when 'datetime'
+ elsif attrtype == 'datetime'
input_type = 'date'
else
input_type = 'text'
@@ -200,7 +200,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
@@ -261,7 +263,7 @@ module ApplicationHelper
dn += '[value]'
end
- if dataclass == Collection
+ if (dataclass == Collection) or (dataclass == File)
selection_param = object.class.to_s.underscore + dn
display_value = attrvalue
if value_info.is_a?(Hash)
@@ -274,9 +276,9 @@ module ApplicationHelper
end
end
if (attr == :components) and (subattr.size > 2)
- chooser_title = "Choose a dataset for #{object.component_input_title(subattr[0], subattr[2])}:"
+ chooser_title = "Choose a #{dataclass == Collection ? 'dataset' : 'file'} for #{object.component_input_title(subattr[0], subattr[2])}:"
else
- chooser_title = "Choose a dataset:"
+ chooser_title = "Choose a #{dataclass == Collection ? 'dataset' : 'file'}:"
end
modal_path = choose_collections_path \
({ title: chooser_title,
@@ -287,6 +289,7 @@ module ApplicationHelper
preconfigured_search_str: (preconfigured_search_str || ""),
action_data: {
merge: true,
+ use_preview_selection: dataclass == File ? true : nil,
selection_param: selection_param,
success: 'page-refresh'
}.to_json,
@@ -306,64 +309,15 @@ module ApplicationHelper
end
end
- if dataclass.andand.is_a?(Class)
- datatype = 'select'
- elsif dataclass == 'number'
- datatype = 'number'
- elsif attrvalue.is_a? Array
- # TODO: find a way to edit arrays with x-editable
- return attrvalue
- elsif 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
+ return attrvalue
end
- # preload data
- preload_uuids = []
- items = []
- selectables = []
-
- attrtext = attrvalue
- if dataclass.is_a? Class and dataclass < ArvadosBase
- objects = get_n_objects_of_class dataclass, 10
- objects.each do |item|
- items << item
- preload_uuids << item.uuid
- end
- if attrvalue and !attrvalue.empty?
- preload_uuids << attrvalue
- end
- preload_links_for_objects preload_uuids
-
- if attrvalue and !attrvalue.empty?
- links_for_object(attrvalue).each do |link|
- if link.link_class.in? ["tag", "identifier"]
- attrtext += " [#{link.name}]"
- end
- end
- selectables.append({name: attrtext, uuid: attrvalue, type: dataclass.to_s})
- end
- itemuuids = []
- items.each do |item|
- itemuuids << item.uuid
- selectables.append({name: item.uuid, uuid: item.uuid, type: dataclass.to_s})
- end
-
- itemuuids.each do |itemuuid|
- links_for_object(itemuuid).each do |link|
- if link.link_class.in? ["tag", "identifier"]
- selectables.each do |selectable|
- if selectable['uuid'] == link.head_uuid
- selectable['name'] += ' [' + link.name + ']'
- end
- end
- end
- end
- end
- end
-
- lt = link_to attrtext, '#', {
+ # When datatype is a String or Fixnum, link_to the attrvalue
+ lt = link_to attrvalue, '#', {
"data-emptytext" => "none",
"data-placement" => "bottom",
"data-type" => datatype,
@@ -378,16 +332,6 @@ module ApplicationHelper
:id => id
}.merge(htmloptions)
- lt += raw("\n")
-
lt
end
@@ -448,10 +392,10 @@ module ApplicationHelper
end
end
- def chooser_preview_url_for object
+ def chooser_preview_url_for object, use_preview_selection=false
case object.class.to_s
when 'Collection'
- polymorphic_path(object, tab_pane: 'chooser_preview')
+ polymorphic_path(object, tab_pane: 'chooser_preview', use_preview_selection: use_preview_selection)
else
nil
end