projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1946-request-body-vs-parameters'
[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 e628edaa3fab292e21ade5c5f24903001aa54fb7..0364c08f5024060c2e3584d7c7047111914d8156 100644
(file)
--- a/
services/api/app/models/user.rb
+++ b/
services/api/app/models/user.rb
@@
-19,6
+19,7
@@
class User < ArvadosModel
t.add :identity_url
t.add :is_active
t.add :is_admin
t.add :identity_url
t.add :is_active
t.add :is_admin
+ t.add :is_invited
t.add :prefs
end
t.add :prefs
end
@@
-28,6
+29,12
@@
class User < ArvadosModel
"#{first_name} #{last_name}"
end
"#{first_name} #{last_name}"
end
+ def is_invited
+ (self.is_active ||
+ Rails.configuration.new_users_are_active ||
+ self.groups_i_can(:read).select { |x| x.match /-f+$/ }.first)
+ end
+
def groups_i_can(verb)
self.group_permissions.select { |uuid, mask| mask[verb] }.keys
end
def groups_i_can(verb)
self.group_permissions.select { |uuid, mask| mask[verb] }.keys
end