projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4233: select from Logs table only columns we will need
[arvados.git]
/
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 624cb3d4c0e0991e656a90baf9b0729df86877ff..c8c4ccc1a96a89facdbc580ab7f9c40eb7f80505 100644
(file)
--- a/
apps/workbench/app/helpers/application_helper.rb
+++ b/
apps/workbench/app/helpers/application_helper.rb
@@
-93,7
+93,7
@@
module ApplicationHelper
if opts[:friendly_name]
if attrvalue.respond_to? :friendly_link_name
if opts[:friendly_name]
if attrvalue.respond_to? :friendly_link_name
- link_name = attrvalue.friendly_link_name
+ link_name = attrvalue.friendly_link_name
opts[:lookup]
else
begin
if resource_class.name == 'Collection'
else
begin
if resource_class.name == 'Collection'
@@
-150,9
+150,7
@@
module ApplicationHelper
def render_editable_attribute(object, attr, attrvalue=nil, htmloptions={})
attrvalue = object.send(attr) if attrvalue.nil?
def render_editable_attribute(object, attr, attrvalue=nil, htmloptions={})
attrvalue = object.send(attr) if attrvalue.nil?
- if !object.attribute_editable?(attr, :ever) or
- (!object.editable? and
- !object.owner_uuid.in?(my_projects.collect(&:uuid)))
+ if not object.attribute_editable?(attr)
if attrvalue && attrvalue.length > 0
return render_attribute_as_textile( object, attr, attrvalue, false )
else
if attrvalue && attrvalue.length > 0
return render_attribute_as_textile( object, attr, attrvalue, false )
else
@@
-241,10
+239,7
@@
module ApplicationHelper
preconfigured_search_str = value_info[:search_for]
end
preconfigured_search_str = value_info[:search_for]
end
- if !object or
- !object.attribute_editable?(attr, :ever) or
- (!object.editable? and
- !object.owner_uuid.in?(my_projects.collect(&:uuid)))
+ if not object.andand.attribute_editable?(attr)
return link_to_if_arvados_object attrvalue
end
return link_to_if_arvados_object attrvalue
end
@@
-266,7
+261,7
@@
module ApplicationHelper
dn += '[value]'
end
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)
selection_param = object.class.to_s.underscore + dn
display_value = attrvalue
if value_info.is_a?(Hash)
@@
-274,12
+269,14
@@
module ApplicationHelper
display_value = link.name
elsif value_info[:link_name]
display_value = value_info[:link_name]
display_value = link.name
elsif value_info[:link_name]
display_value = value_info[:link_name]
+ elsif value_info[:selection_name]
+ display_value = value_info[:selection_name]
end
end
if (attr == :components) and (subattr.size > 2)
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
else
- chooser_title = "Choose a
dataset
:"
+ chooser_title = "Choose a
#{dataclass == Collection ? 'dataset' : 'file'}
:"
end
modal_path = choose_collections_path \
({ title: chooser_title,
end
modal_path = choose_collections_path \
({ title: chooser_title,
@@
-290,6
+287,7
@@
module ApplicationHelper
preconfigured_search_str: (preconfigured_search_str || ""),
action_data: {
merge: true,
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,
selection_param: selection_param,
success: 'page-refresh'
}.to_json,
@@
-451,10
+449,10
@@
module ApplicationHelper
end
end
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'
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
else
nil
end