projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2871-preload-objects
[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 937c204148bc0b793fe8d90ecaf76bc5fb1c1b43..43c96b55366e8a3a583b57fc82717c58f19c99a1 100644
(file)
--- a/
apps/workbench/app/helpers/application_helper.rb
+++ b/
apps/workbench/app/helpers/application_helper.rb
@@
-90,8
+90,8
@@
module ApplicationHelper
else
begin
if resource_class.name == 'Collection'
else
begin
if resource_class.name == 'Collection'
- link_name = collections_for_object(link_uuid).
first
.friendly_link_name
- else
+ 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
link_name = object_for_dataclass(resource_class, link_uuid).friendly_link_name
end
rescue RuntimeError
@@
-245,7
+245,8
@@
module ApplicationHelper
dn += '[value]'
end
dn += '[value]'
end
- preload_uuids = [attrvalue]
+ # preload data
+ preload_uuids = []
items = []
selectables = []
items = []
selectables = []
@@
-274,7
+275,7
@@
module ApplicationHelper
itemuuids << item.uuid
selectables.append({name: item.uuid, uuid: item.uuid, type: dataclass.to_s})
end
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"]
itemuuids.each do |itemuuid|
links_for_object(itemuuid).each do |link|
if link.link_class.in? ["tag", "identifier"]