projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
26d8772
)
16989: Make sure username is valid before trying to create repo
author
Peter Amstutz <peter.amstutz@curii.com>
Mon, 12 Oct 2020 19:18:32 +0000
(15:18 -0400)
committer
Peter Amstutz <peter.amstutz@curii.com>
Mon, 12 Oct 2020 19:18:32 +0000
(15:18 -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 f3cf4b38f0befb71e8ffa9ad79e2743709c745e5..34a123e7247c94d3f811e9c43f3e59e266294046 100644
(file)
--- a/
services/api/app/models/user.rb
+++ b/
services/api/app/models/user.rb
@@
-224,11
+224,8
@@
SELECT target_uuid, perm_level
group_perm = create_user_group_link
# Add git repo
- if repo_name.nil? && username && Rails.configuration.Users.AutoSetupNewUsersWithRepository
- repo_name = "#{username}/#{username}"
- end
-
- repo_perm = if repo_name
+ repo_perm = if (!repo_name.nil? || Rails.configuration.Users.AutoSetupNewUsersWithRepository) and !username.nil?
+ repo_name ||= "#{username}/#{username}"
create_user_repo_link repo_name
end