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 d21991519553b9d889f742d1f137b11fc93e17bb..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
@@
-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