[ARVADOS] updated: 7485476596408f9611d59e88bf78a66431460b4c

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  7485476596408f9611d59e88bf78a66431460b4c (commit)
      from  edebf116a9f743a7a276d514c4cbad72c3406922 (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 7485476596408f9611d59e88bf78a66431460b4c
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date:   Thu Aug 14 07:51:35 2014 -0400

    3114: bug fix: when rendering JSON response to a generic #show action, correctly set an 'href' attribute in the response to be the #show url for the object

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 18397e1..e38a32d 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -174,7 +174,7 @@ class ApplicationController < ActionController::Base
       return render_not_found("object not found")
     end
     respond_to do |f|
-      f.json { render json: @object.attributes.merge(href: url_for(@object)) }
+      f.json { render json: @object.attributes.merge(href: url_for(action: :show, id: @object)) }
       f.html {
         if params['tab_pane']
           comparable = self.respond_to? :compare

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


hooks/post-receive
--