projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9df2ccd
)
Setup default VM from AutoSetupNewUsersWithVmUUID refs #16989
author
Peter Amstutz <peter.amstutz@curii.com>
Fri, 9 Oct 2020 22:52:14 +0000
(18:52 -0400)
committer
Peter Amstutz <peter.amstutz@curii.com>
Fri, 9 Oct 2020 22:52:14 +0000
(18:52 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
services/api/app/models/user.rb
patch
|
blob
|
history
diff --git
a/services/api/app/models/user.rb
b/services/api/app/models/user.rb
index 57fe4f055d6aff8459c4174a405f960bacb2f62e..f8cc78c1d7f835fa5b762067d3e0f2cf8b9bad22 100644
(file)
--- a/
services/api/app/models/user.rb
+++ b/
services/api/app/models/user.rb
@@
-221,6
+221,11
@@
SELECT target_uuid, perm_level
group_perm = create_user_group_link
repo_perm = create_user_repo_link repo_name
+
+ if vm_uuid.nil? and !Rails.configuration.Users.AutoSetupNewUsersWithVmUUID.empty?
+ vm_uuid = Rails.configuration.Users.AutoSetupNewUsersWithVmUUID
+ end
+
vm_login_perm = create_vm_login_permission_link(vm_uuid, username) if vm_uuid
if send_notification_email.nil?