Merge branch 'master' into 4026-project-move-admin

[arvados.git] / apps / workbench / app / views / application / _selection_checkbox.html.erb

diff --git a/apps/workbench/app/views/application/_selection_checkbox.html.erb b/apps/workbench/app/views/application/_selection_checkbox.html.erb
index 9645455ace5975b59eb69dbd29735ba5469caa24..a234e9f65696d94d0b11ff864b89949232dd9966 100644 (file)
--- a/apps/workbench/app/views/application/_selection_checkbox.html.erb
+++ b/apps/workbench/app/views/application/_selection_checkbox.html.erb
@@ -1,5 +1,5 @@
-<%if object and object.class.goes_in_folders? %>
-  <% fn = if defined? friendly_name
+<%if object and object.uuid and (object.class.goes_in_projects? or (object.is_a?(Link) and ArvadosBase::resource_class_for_uuid(object.head_uuid).to_s == 'Collection')) %>
+  <% fn = if defined? friendly_name and not friendly_name.nil?
             friendly_name
           else
             link_to_if_arvados_object object, {no_link: true}