Merge branch 'master' into 3504-clients-compatible-with-3036

[arvados.git] / apps / workbench / app / models / group.rb

diff --git a/apps/workbench/app/models/group.rb b/apps/workbench/app/models/group.rb
index 638f6e884abf5fca1df9768bbf5eca56184de8d3..558c587a1c9c83d3a0bb824475e0b8f2553e4a0d 100644 (file)
--- a/apps/workbench/app/models/group.rb
+++ b/apps/workbench/app/models/group.rb
@@ -1,8 +1,17 @@
 class Group < ArvadosBase
-  def self.goes_in_folders?
+  def self.goes_in_projects?
     true
   end
 
+  def self.contents params={}
+    res = arvados_api_client.api self, "/contents", {
+      _method: 'GET'
+    }.merge(params)
+    ret = ArvadosResourceList.new
+    ret.results = arvados_api_client.unpack_api_response(res)
+    ret
+  end
+
   def contents params={}
     res = arvados_api_client.api self.class, "/#{self.uuid}/contents", {
       _method: 'GET'
@@ -13,7 +22,7 @@ class Group < ArvadosBase
   end
 
   def class_for_display
-    group_class == 'folder' ? 'Folder' : super
+    group_class == 'project' ? 'Project' : super
   end
 
   def editable?