3235: Merge branch 'master' into 3235-top-nav-site-search

[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 dde6019e9ca4ed9a5d51978fe933fabee0208727..30488c3383b812bb7ffc32dbec524bdb88c1c2cf 100644 (file)
--- a/apps/workbench/app/models/group.rb
+++ b/apps/workbench/app/models/group.rb
@@ -1,15 +1,28 @@
 class Group < ArvadosBase
+  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", {
+    res = arvados_api_client.api self.class, "/#{self.uuid}/contents", {
       _method: 'GET'
     }.merge(params)
     ret = ArvadosResourceList.new
-    ret.results = $arvados_api_client.unpack_api_response(res)
+    ret.results = arvados_api_client.unpack_api_response(res)
     ret
   end
 
   def class_for_display
-    group_class == 'folder' ? 'Folder' : super
+    group_class.in?(['folder', 'project']) ? 'Project' : super
   end
 
   def editable?