projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2288-smoke-test'
[arvados.git]
/
services
/
api
/
lib
/
common_api_template.rb
diff --git
a/services/api/lib/common_api_template.rb
b/services/api/lib/common_api_template.rb
index d474581ef369444199eef972f554c00fdf33dac9..b1da94ab331b3b5033521e70ee39083003cfe2d6 100644
(file)
--- a/
services/api/lib/common_api_template.rb
+++ b/
services/api/lib/common_api_template.rb
@@
-25,7
+25,7
@@
module CommonApiTemplate
def as_api_response(template=nil, opts={})
if template.nil?
user = opts[:for_user] || current_user
def as_api_response(template=nil, opts={})
if template.nil?
user = opts[:for_user] || current_user
- if user.is_admin and self.respond_to? :api_accessible_superuser
+ if user.
andand.
is_admin and self.respond_to? :api_accessible_superuser
template = :superuser
else
template = :user
template = :superuser
else
template = :user