Merge branch 'master' into 5675-project-subprojects-in-anonymous-view

diff --combined apps/workbench/app/helpers/application_helper.rb
index e105769beb303dc4a0ce5cb02539b16bff8d6026,d1655b92843ddf270c488c1677f8ef54f2d938db..d1ee6cba1c9bcded45b229e7b6c83e7630a01b1d
--- 1/apps/workbench/app/helpers/application_helper.rb
--- 2/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@@ -165,11 -165,7 +165,11 @@@ module ApplicationHelpe
        if opts[:no_link] or (resource_class == User && !current_user)
          raw(link_name)
        else
 -        (link_to raw(link_name), { controller: resource_class.to_s.tableize, action: 'show', id: ((opts[:name_link].andand.uuid) || link_uuid) }, style_opts) + raw(tags)
 +        controller_class = resource_class.to_s.tableize
 +        if controller_class.eql?('groups') and object.andand.group_class.eql?('project')
 +          controller_class = 'projects'
 +        end
 +        (link_to raw(link_name), { controller: controller_class, action: 'show', id: ((opts[:name_link].andand.uuid) || link_uuid) }, style_opts) + raw(tags)
        end
      else
        # just return attrvalue if it is not recognizable as an Arvados object or uuid.
@@@ -368,7 -364,7 +368,7 @@@
             success: 'page-refresh'
           }.to_json,
          })
-       is_readable_input = object_readable attrvalue unless attrvalue.andand.empty?
+       is_readable_input = attrvalue.present? and object_readable attrvalue, Collection
        return content_tag('div', :class => 'input-group') do
          html = text_field_tag(dn, display_value,
                                :class =>