X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ec08a1b9aefcd801d1f0c0b282b268cbee6939bc..f3da69fb1b882c7fe8feb765ad0558f13706931a:/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 b03b1093ac..43c96b5536 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -89,7 +89,11 @@ module ApplicationHelper
link_name = attrvalue.friendly_link_name
else
begin
- link_name = resource_class.find(link_uuid).friendly_link_name
+ if resource_class.name == 'Collection'
+ link_name = collections_for_object(link_uuid).andand.first.andand.friendly_link_name
+ else
+ link_name = object_for_dataclass(resource_class, link_uuid).friendly_link_name
+ end
rescue RuntimeError
# If that lookup failed, the link will too. So don't make one.
return attrvalue
@@ -100,13 +104,15 @@ module ApplicationHelper
link_name = "#{resource_class.to_s}: #{link_name}"
end
if !opts[:no_tags] and resource_class == Collection
- Link.where(head_uuid: link_uuid, link_class: ["tag", "identifier"]).each do |tag|
- link_name += ' ' + html_escape(tag.name) + ''
+ links_for_object(link_uuid).each do |tag|
+ if tag.link_class.in? ["tag", "identifier"]
+ link_name += ' ' + html_escape(tag.name) + ''
+ end
end
end
if opts[:thumbnail] and resource_class == Collection
# add an image thumbnail if the collection consists of a single image file.
- Collection.where(uuid: link_uuid).each do |c|
+ collections_for_object(link_uuid).each do |c|
if c.files.length == 1 and CollectionsHelper::is_image c.files.first[1]
link_name += " "
link_name += image_tag "#{url_for c}/#{CollectionsHelper::file_path c.files.first}", style: "height: 4em; width: auto"
@@ -239,13 +245,14 @@ module ApplicationHelper
dn += '[value]'
end
- preload_uuids = [attrvalue]
+ # preload data
+ preload_uuids = []
items = []
selectables = []
attrtext = attrvalue
if dataclass and dataclass.is_a? Class
- objects = get_objects_of_type dataclass, 10
+ objects = get_n_objects_of_class dataclass, 10
objects.each do |item|
items << item
preload_uuids << item.uuid
@@ -268,7 +275,7 @@ module ApplicationHelper
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"]