From 7f1e9f495fd2e335af08d7be54fb71eee6324421 Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curoverse.com>
Date: Tue, 3 Jun 2014 16:08:49 -0400
Subject: [PATCH] 2872: Fix links to collections from folder view.

---
 apps/workbench/app/helpers/application_helper.rb             | 2 +-
 .../app/views/application/_show_object_button.html.erb       | 5 +++--
 .../workbench/app/views/folders/_show_contents_rows.html.erb | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 2d7995e74d..e23376bcf7 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -124,7 +124,7 @@ module ApplicationHelper
       if opts[:no_link]
         raw(link_name)
       else
-        link_to raw(link_name), { controller: resource_class.to_s.tableize, action: 'show', id: link_uuid }, style_opts
+        link_to raw(link_name), { controller: resource_class.to_s.tableize, action: 'show', id: ((opts[:name_link].andand.uuid) || link_uuid) }, style_opts
       end
     else
       # just return attrvalue if it is not recognizable as an Arvados object or uuid.
diff --git a/apps/workbench/app/views/application/_show_object_button.html.erb b/apps/workbench/app/views/application/_show_object_button.html.erb
index 17e9737f09..4f6eb7e92c 100644
--- a/apps/workbench/app/views/application/_show_object_button.html.erb
+++ b/apps/workbench/app/views/application/_show_object_button.html.erb
@@ -1,12 +1,13 @@
 <% htmloptions = {class: ''}.merge(htmloptions || {})
    htmloptions[:class] += " btn-#{size}" rescue nil %>
 <%= link_to_if_arvados_object object, {
-      link_text: raw('<i class="fa fa-fw ' + fa_icon_class_for_object(object) + '"></i>')
+      link_text: raw('<i class="fa fa-fw ' + fa_icon_class_for_object(object) + '"></i>'),
+      name_link: (defined?(name_link) && name_link && name_link.uuid) ? name_link : nil
     }, {
       data: {
         toggle: 'tooltip',
         placement: 'top'
       },
       title: 'show',
-      class: 'btn btn-default btn-nodecorate ' + htmloptions[:class]
+      class: 'btn btn-default btn-nodecorate ' + htmloptions[:class],
     } %>
diff --git a/apps/workbench/app/views/folders/_show_contents_rows.html.erb b/apps/workbench/app/views/folders/_show_contents_rows.html.erb
index 68fe0484c8..3c64b533b9 100644
--- a/apps/workbench/app/views/folders/_show_contents_rows.html.erb
+++ b/apps/workbench/app/views/folders/_show_contents_rows.html.erb
@@ -15,7 +15,7 @@
         <i class="fa fa-fw"></i><%# placeholder %>
       <% end %>
 
-      <%= render :partial => "show_object_button", :locals => {object: object, size: 'sm'} %>
+      <%= render :partial => "show_object_button", :locals => {object: object, size: 'sm', name_link: name_link} %>
 
       <%= render_editable_attribute (name_link || object), 'name', nil, {btnplacement: :left, tiptitle: 'rename'} %>
     </td>
-- 
2.30.2