20943: role groups should now handle being trashed

[arvados.git] / services / api / app / controllers / arvados / v1 / groups_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index 11212e1b6910f42916251b27f0fcfe4a549bfadd..36839a1da0f55109d9a4e653be797f9231f1742b 100644 (file)
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -11,8 +11,6 @@ class Arvados::V1::GroupsController < ApplicationController
   skip_before_action :find_object_by_uuid, only: :shared
   skip_before_action :render_404_if_no_object, only: :shared
 
-  TRASHABLE_CLASSES = ['project']
-
   def self._index_requires_parameters
     (super rescue {}).
       merge({
@@ -101,15 +99,6 @@ class Arvados::V1::GroupsController < ApplicationController
     end
   end
 
-  def destroy
-    if !TRASHABLE_CLASSES.include?(@object.group_class)
-      @object.destroy
-      show
-    else
-      super # Calls destroy from TrashableController module
-    end
-  end
-
   def render_404_if_no_object
     if params[:action] == 'contents'
       if !params[:uuid]