Merge branch 'master' into 5310-arv-copy-by-pdh

[arvados.git] / services / api / app / models / user.rb

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index f55e24b211bc565736a88eeca869b88b7ddf74a9..a47a4583cd533e272d9b5f850b4281aef75f26c3 100644 (file)
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -402,8 +402,7 @@ class User < ArvadosModel
     return (Link.where(tail_uuid: self.uuid,
                        head_uuid: all_users_group[:uuid],
                        link_class: 'permission',
-                       name: 'can_read').first
-            or
+                       name: 'can_read').first or
             Link.create(tail_uuid: self.uuid,
                         head_uuid: all_users_group[:uuid],
                         link_class: 'permission',
@@ -412,8 +411,8 @@ class User < ArvadosModel
 
   # Give the special "System group" permission to manage this user and
   # all of this user's stuff.
-  #
   def add_system_group_permission_link
+    return true if uuid == system_user_uuid
     act_as_system_user do
       Link.create(link_class: 'permission',
                   name: 'can_manage',