Merge branch 'master' into 2640-folder-api

[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 bc1f4763cc90ffa29dc7327b44cfefdd173df0fb..44d615b89fecf117dcc618e01627e1beb74e38f2 100644 (file)
--- a/apps/workbench/app/models/user.rb
+++ b/apps/workbench/app/models/user.rb
@@ -27,7 +27,26 @@ class User < ArvadosBase
                                                 {}))
   end
 
-  def attribute_editable?(attr)
+  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)
   end
+
+  def friendly_link_name
+    [self.first_name, self.last_name].compact.join ' '
+  end
+
+  def 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)
+  end
+
 end