Merge branch 'master' into 4062-infinite-scroll-repeat-issue
[arvados.git] / apps / workbench / app / models / user.rb
index 74f4a6b1de060a0b2b59e557e1c6091d78569ae5..7aaa4fe93951ca831add8b7bae6778e251b8b871 100644 (file)
@@ -27,15 +27,20 @@ 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, *args
-    (not (self.uuid.andand.match(/000000000000000$/) and self.is_admin)) and super
+  def attribute_editable?(attr, ever=nil)
+    (ever or not (self.uuid.andand.match(/000000000000000$/) and
+                  self.is_admin)) and super
   end
 
-  def friendly_link_name
+  def friendly_link_name lookup=nil
     [self.first_name, self.last_name].compact.join ' '
   end