Merge branch '3112-report-bug' into 3620-admin-only-gear-menu

[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..b7ffd638bbc0ae4c7310782d0851704e54b93f6c 100644 (file)
--- a/apps/workbench/app/models/group.rb
+++ b/apps/workbench/app/models/group.rb
@@ -1,20 +1,27 @@
 class Group < ArvadosBase
-  def contents params={}
-    res = $arvados_api_client.api self.class, "/#{self.uuid}/contents", {
+  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.results = arvados_api_client.unpack_api_response(res)
     ret
   end
 
-  def class_for_display
-    group_class == 'folder' ? 'Folder' : super
+  def contents params={}
+    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
   end
 
-  def editable?
-    respond_to?(:writable_by) and
-      writable_by and
-      writable_by.index(current_user.uuid)
+  def class_for_display
+    group_class == 'project' ? 'Project' : super
   end
 end