Merge branch 'master' into 6859-fix-invalid-manifests

[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..67c7f8c4fa240a2ccb78534ddcb26243c5eb30b2 100644 (file)
--- a/services/api/lib/common_api_template.rb
+++ b/services/api/lib/common_api_template.rb
@@ -16,7 +16,6 @@ module CommonApiTemplate
       t.add :modified_by_client_uuid
       t.add :modified_by_user_uuid
       t.add :modified_at
-      t.add :updated_at
     end
   end
 
@@ -25,7 +24,7 @@ module CommonApiTemplate
     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