projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2934: add "bar" repository to test fixture
[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 d6dd9dc8a86df40852f7b5bd459ab04b37f0d74f..52dd8d79ff47014a9bfe0896a818b28c4d83395d 100644
(file)
--- a/
services/api/app/models/user.rb
+++ b/
services/api/app/models/user.rb
@@
-12,7
+12,7
@@
class User < ArvadosModel
before_update :prevent_inactive_admin
before_create :check_auto_admin
after_create :add_system_group_permission_link
before_update :prevent_inactive_admin
before_create :check_auto_admin
after_create :add_system_group_permission_link
- after_create
AdminNotifier
+ after_create
:send_admin_notifications
has_many :authorized_keys, :foreign_key => :authorized_user_uuid, :primary_key => :uuid
has_many :authorized_keys, :foreign_key => :authorized_user_uuid, :primary_key => :uuid
@@
-339,20
+339,20
@@
class User < ArvadosModel
perm_exists = false
login_perms.each do |perm|
if perm.properties['username'] == repo_name
perm_exists = false
login_perms.each do |perm|
if perm.properties['username'] == repo_name
- perm_exists =
true
+ perm_exists =
perm
break
end
end
break
end
end
- if !perm_exists
+ if perm_exists
+ login_perm = perm_exists
+ else
login_perm = Link.create(tail_uuid: self.uuid,
head_uuid: vm[:uuid],
link_class: 'permission',
name: 'can_login',
properties: {'username' => repo_name})
logger.info { "login permission: " + login_perm[:uuid] }
login_perm = Link.create(tail_uuid: self.uuid,
head_uuid: vm[:uuid],
link_class: 'permission',
name: 'can_login',
properties: {'username' => repo_name})
logger.info { "login permission: " + login_perm[:uuid] }
- else
- login_perm = login_perms.first
end
return login_perm
end
return login_perm
@@
-402,4
+402,12
@@
class User < ArvadosModel
head_uuid: self.uuid)
end
end
head_uuid: self.uuid)
end
end
+
+ # Send admin notifications
+ def send_admin_notifications
+ AdminNotifier.new_user(self).deliver
+ if not self.is_active then
+ AdminNotifier.new_inactive_user(self).deliver
+ end
+ end
end
end