projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e6841c7
)
fix call to api_client.uuid when api_client is nil
author
Tom Clegg <tom@clinicalfuture.com>
Wed, 20 Mar 2013 01:08:26 +0000
(18:08 -0700)
committer
Tom Clegg <tom@clinicalfuture.com>
Wed, 20 Mar 2013 01:09:10 +0000
(18:09 -0700)
app/controllers/application_controller.rb
patch
|
blob
|
history
diff --git
a/app/controllers/application_controller.rb
b/app/controllers/application_controller.rb
index 86bebcd103d1da8a00f9540f3c7f12e9c73f2504..f999dd8b1f801d9b7aa64c72d748e7838d3c255d 100644
(file)
--- a/
app/controllers/application_controller.rb
+++ b/
app/controllers/application_controller.rb
@@
-183,7
+183,7
@@
class ApplicationController < ActionController::Base
Thread.current[:api_client_trusted] = session[:api_client_trusted]
Thread.current[:api_client_ip_address] = remote_ip
Thread.current[:api_client_authorization] = api_client_auth
- Thread.current[:api_client_uuid] = api_client.uuid
+ Thread.current[:api_client_uuid] = api_client
&& api_client
.uuid
Thread.current[:api_client] = api_client
Thread.current[:user] = user
yield