Merge branch 'master' of git.curoverse.com:arvados into 5440-remove-doc-getting-started

[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 420ffbaf117a599a4ad1a8d31ee2a764197c0ddd..72f961f38a225e1e707fc8db92d1da77e5f7c7d7 100644 (file)
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -177,15 +177,15 @@ 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_if_not_readable, opts={})
+    resource_class = resource_class_for_uuid(attrvalue)
     if !resource_class
-      return link_text_if_not_readable
+      return link_to_if_arvados_object attrvalue, opts
     end
 
-    if resource_class.andand.to_s == 'Collection'
+    if resource_class.to_s == 'Collection'
       if CollectionsHelper.match(attrvalue)
-        readable = Collection.find? attrvalue
+        readable = collection_for_pdh(attrvalue).any?
       else
         readable = collections_for_object(attrvalue).any?
       end
@@ -194,11 +194,7 @@ module ApplicationHelper
     end
 
     if readable
-      if use_friendly_name
-        link_to_if_arvados_object attrvalue, friendly_name: true
-      else
-        link_to_if_arvados_object attrvalue, link_text: link_text
-      end
+      link_to_if_arvados_object attrvalue, opts
     else
       link_text_if_not_readable
     end
@@ -298,7 +294,7 @@ module ApplicationHelper
     end
 
     if not object.andand.attribute_editable?(attr)
-      return link_to_if_arvados_object attrvalue
+      return link_to_arvados_object_if_readable(attrvalue, attrvalue, friendly_name: true)
     end
 
     if dataclass