[ARVADOS] updated: ab32bf9232962ab372f54b2bd5fe770b28a0e565

[git at public.curoverse.com]

Summary of changes:
 .../v1/api_client_authorizations_controller.rb     |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

       via  ab32bf9232962ab372f54b2bd5fe770b28a0e565 (commit)
      from  81707e982741b7ab100156c3390ae245b1e9f777 (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 ab32bf9232962ab372f54b2bd5fe770b28a0e565
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jan 20 10:16:55 2014 -0800

    Render token with ApplicationController#show instead of calling
    as_api_response directly from
    api_client_authorizations.create_system_auth.
    
    Resolves:
    
    Error: #<ActsAsApi::TemplateNotFoundError: acts_as_api template
    :superuser was not found for model ApiClientAuthorization>

diff --git a/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb b/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb
index 17c5c4b..65a3e00 100644
--- a/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb
+++ b/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb
@@ -10,13 +10,13 @@ class Arvados::V1::ApiClientAuthorizationsController < ApplicationController
     }
   end
   def create_system_auth
-    api_client_auth = ApiClientAuthorization.
+    @object = ApiClientAuthorization.
       new(user_id: system_user.id,
           api_client_id: params[:api_client_id] || current_api_client.andand.id,
           created_by_ip_address: remote_ip,
           scopes: Oj.load(params[:scopes] || '["all"]'))
-    api_client_auth.save!
-    render :json => api_client_auth.as_api_response(:superuser)
+    @object.save!
+    show
   end
 
   def create

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


hooks/post-receive
--