X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7083622b12ec5f432fbe095c2230bde41bd84ca5..a101f4ea6eb2cd23a27e4c0ec5c0f0df226af2fc:/services/api/app/models/user.rb diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb index bbb2378f5c..1d1d83662c 100644 --- a/services/api/app/models/user.rb +++ b/services/api/app/models/user.rb @@ -110,7 +110,6 @@ class User < ArvadosModel end def can?(actions) - return true if is_admin actions.each do |action, target| unless target.nil? if target.respond_to? :uuid @@ -126,7 +125,7 @@ class User < ArvadosModel user_uuids_subquery = USER_UUIDS_SUBQUERY_TEMPLATE % {user: "$1", perm_level: "$3"} - unless ActiveRecord::Base.connection. + if !is_admin && !ActiveRecord::Base.connection. exec_query(%{ SELECT 1 FROM #{PERMISSION_VIEW} WHERE user_uuid in (#{user_uuids_subquery}) and