Merge branch '2800-python-global-state' into 2800-pgs

[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 58c1d3f35a75c3bb03b0a4c1c009ebdbbd5dafc1..87ea5faefa85976b8d11350b291dffc28b2514d7 100644 (file)
--- a/apps/workbench/app/models/user.rb
+++ b/apps/workbench/app/models/user.rb
@@ -6,24 +6,15 @@ class User < ArvadosBase
   end
 
   def self.current
-    res = $arvados_api_client.api self, '/current'
-    $arvados_api_client.unpack_api_response(res)
+    res = arvados_api_client.api self, '/current'
+    arvados_api_client.unpack_api_response(res)
   end
 
   def self.system
-    $arvados_system_user ||= begin
-                               res = $arvados_api_client.api self, '/system'
-                               $arvados_api_client.unpack_api_response(res)
-                             end
-  end
-
-  def owned_items params={}
-    res = $arvados_api_client.api self.class, "/#{self.uuid}/owned_items", {
-      _method: 'GET'
-    }.merge(params)
-    ret = ArvadosResourceList.new
-    ret.results = $arvados_api_client.unpack_api_response(res)
-    ret
+    @@arvados_system_user ||= begin
+                                res = arvados_api_client.api self, '/system'
+                                arvados_api_client.unpack_api_response(res)
+                              end
   end
 
   def full_name
@@ -31,17 +22,21 @@ class User < ArvadosBase
   end
 
   def activate
-    self.private_reload($arvados_api_client.api(self.class,
-                                                "/#{self.uuid}/activate",
-                                                {}))
+    self.private_reload(arvados_api_client.api(self.class,
+                                               "/#{self.uuid}/activate",
+                                               {}))
+  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
@@ -49,13 +44,19 @@ class User < ArvadosBase
   end
 
   def unsetup
-    self.private_reload($arvados_api_client.api(self.class,
-                                                "/#{self.uuid}/unsetup",
-                                                {}))
+    self.private_reload(arvados_api_client.api(self.class,
+                                               "/#{self.uuid}/unsetup",
+                                               {}))
   end
 
   def self.setup params
-    $arvados_api_client.api(self, "/setup", params)
+    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