[ARVADOS] updated: 41f3658885062525b4f389ac626a1365d951af77

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/links_controller.rb | 7 +++++++
 1 file changed, 7 insertions(+)

       via  41f3658885062525b4f389ac626a1365d951af77 (commit)
      from  437e25b167b3d1f7e4f8c32699de4243cfd59d85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 41f3658885062525b4f389ac626a1365d951af77
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Aug 12 16:43:45 2014 -0400

    3354: Redirect link#show to "show named object".
    
    This way, if you put a text link like "foo":{uuid-of-name-link} in a
    textile description field, it leads to the named object rather than
    the generic "show attributes" page for the link object.

diff --git a/apps/workbench/app/controllers/links_controller.rb b/apps/workbench/app/controllers/links_controller.rb
index 78529c1..fd51fb1 100644
--- a/apps/workbench/app/controllers/links_controller.rb
+++ b/apps/workbench/app/controllers/links_controller.rb
@@ -1,2 +1,9 @@
 class LinksController < ApplicationController
+  def show
+    if @object.link_class == 'name' and
+        Collection == ArvadosBase::resource_class_for_uuid(@object.head_uuid)
+      return redirect_to collection_path(@object.uuid)
+    end
+    super
+  end
 end

-----------------------------------------------------------------------


hooks/post-receive
--