projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '21059-signup-email' refs #21059
[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 7cc7cc491ca71d088d4fe64e436e54ac6eb375e2..4d7b2bbaeb2d7d42a79227cff1f2f09142f19179 100644
(file)
--- a/
services/api/app/models/user.rb
+++ b/
services/api/app/models/user.rb
@@
-31,8
+31,8
@@
class User < ArvadosModel
after_update :setup_on_activate
before_create :check_auto_admin
after_update :setup_on_activate
before_create :check_auto_admin
- before_
create
:set_initial_username, :if => Proc.new {
- email
+ before_
validation
:set_initial_username, :if => Proc.new {
+
new_record? &&
email
}
before_create :active_is_not_nil
after_create :after_ownership_change
}
before_create :active_is_not_nil
after_create :after_ownership_change