projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '3889-functional-testing-TC' into 3889-functional-testing
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
user.rb
diff --git
a/apps/workbench/app/models/user.rb
b/apps/workbench/app/models/user.rb
index 9c914776a2cf43b5ef0241dfced63c0a745a1bb5..87ea5faefa85976b8d11350b291dffc28b2514d7 100644
(file)
--- a/
apps/workbench/app/models/user.rb
+++ b/
apps/workbench/app/models/user.rb
@@
-27,11
+27,15
@@
class User < ArvadosBase
{}))
end
{}))
end
+ def contents params={}
+ Group.contents params.merge(uuid: self.uuid)
+ end
+
def attributes_for_display
super.reject { |k,v| %w(owner_uuid default_owner_uuid identity_url prefs).index k }
end
def attributes_for_display
super.reject { |k,v| %w(owner_uuid default_owner_uuid identity_url prefs).index k }
end
- def attribute_editable? attr, *args
+
def attribute_editable? attr, *args
(not (self.uuid.andand.match(/000000000000000$/) and self.is_admin)) and super
end
(not (self.uuid.andand.match(/000000000000000$/) and self.is_admin)) and super
end
@@
-49,4
+53,10
@@
class User < ArvadosBase
arvados_api_client.api(self, "/setup", params)
end
arvados_api_client.api(self, "/setup", params)
end
+ def update_profile params
+ self.private_reload(arvados_api_client.api(self.class,
+ "/#{self.uuid}/profile",
+ params))
+ end
+
end
end