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 59ab1ba5addabd5962a3bd81aa5fbd44c0b21f06..87ea5faefa85976b8d11350b291dffc28b2514d7 100644 (file)
--- a/apps/workbench/app/models/user.rb
+++ b/apps/workbench/app/models/user.rb
@@ -17,11 +17,6 @@ class User < ArvadosBase
                               end
   end
 
-  def owned_items
-    res = arvados_api_client.api self.class, "/#{self.uuid}/owned_items"
-    arvados_api_client.unpack_api_response(res)
-  end
-
   def full_name
     (self.first_name || "") + " " + (self.last_name || "")
   end
@@ -32,12 +27,16 @@ class User < ArvadosBase
                                                {}))
   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 attribute_editable?(attr)
-    (not (self.uuid.andand.match(/000000000000000$/) and self.is_admin)) and super(attr)
+  def attribute_editable? attr, *args
+    (not (self.uuid.andand.match(/000000000000000$/) and self.is_admin)) and super
   end
 
   def friendly_link_name
@@ -54,4 +53,10 @@ class User < ArvadosBase
     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