Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench

[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 782385fb0d88240211b02793cf9aa299249c45cd..cc9b9bb058cea3e2696eaf37a85559fde93d1431 100644 (file)
--- a/apps/workbench/app/models/user.rb
+++ b/apps/workbench/app/models/user.rb
@@ -21,7 +21,21 @@ class User < ArvadosBase
     (self.first_name || "") + " " + (self.last_name || "")
   end
 
-  def attribute_editable?(attr)
+  def activate
+    self.private_reload($arvados_api_client.api(self.class,
+                                                "/#{self.uuid}/activate",
+                                                {}))
+  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)
   end
+
+  def friendly_link_name
+    [self.first_name, self.last_name].compact.join ' '
+  end
 end