5365: add @distinct handling to workbench select queries and use this to preload...

[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 147e5a60bbf1b60ffbb3d17a19916a5b4d65b337..b145fddcc9e63fad5c315e26856260c99dac6b7c 100644 (file)
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -177,13 +177,22 @@ module ApplicationHelper
     end
   end
 
-  def link_to_arvados_object_if_readable(attrvalue, link_text, link_text_if_not_readable, use_friendly_name=false, resource_class=nil)
-    resource_class = resource_class_for_uuid(attrvalue) if !resource_class
+  def link_to_arvados_object_if_readable(attrvalue, link_text, link_text_if_not_readable, use_friendly_name=false)
+    resource_class = resource_class_for_uuid(attrvalue)
     if !resource_class
       return link_text_if_not_readable
     end
 
-    readable = resource_class.find?(attrvalue)
+    if resource_class.to_s == 'Collection'
+      if CollectionsHelper.match(attrvalue)
+        readable = collection_for_pdh(attrvalue).any?
+      else
+        readable = collections_for_object(attrvalue).any?
+      end
+    else
+      readable = object_for_dataclass(resource_class, attrvalue)
+    end
+
     if readable
       if use_friendly_name
         link_to_if_arvados_object attrvalue, friendly_name: true