projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another go at migration, uses batched loading and transactions, should have
[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 50dc668448a9eee7a81a0924cd1c0b27b7b8b18b..81cae987a20d023f61d96a0ade93c9dd75d60c84 100644
(file)
--- a/
services/api/app/models/user.rb
+++ b/
services/api/app/models/user.rb
@@
-27,7
+27,7
@@
class User < ArvadosModel
ALL_PERMISSIONS = {read: true, write: true, manage: true}
def full_name
ALL_PERMISSIONS = {read: true, write: true, manage: true}
def full_name
- "#{first_name} #{last_name}"
+ "#{first_name} #{last_name}"
.strip
end
def is_invited
end
def is_invited
@@
-245,12
+245,12
@@
class User < ArvadosModel
end
def create_oid_login_perm (openid_prefix)
end
def create_oid_login_perm (openid_prefix)
- login_perm_props = {
identity_url_prefix:
openid_prefix}
+ login_perm_props = {
"identity_url_prefix" =>
openid_prefix}
# Check oid_login_perm
oid_login_perms = Link.where(tail_uuid: self.email,
link_class: 'permission',
# Check oid_login_perm
oid_login_perms = Link.where(tail_uuid: self.email,
link_class: 'permission',
- name: 'can_login').where("head_uuid
like ?", User.uuid_like_pattern
)
+ name: 'can_login').where("head_uuid
= ?", self.uuid
)
if !oid_login_perms.any?
# create openid login permission
if !oid_login_perms.any?
# create openid login permission