18995: Merge branch 'main' into 18995-code-cleanup-1

[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 7fbb86c010c01df4d08cbde40c434c7f8b9063ae..8539332f16509a6f00a6e9e27617d16a2ef75e45 100644 (file)
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -34,7 +34,7 @@ class Arvados::V1::GroupsController < ApplicationController
     params = _index_requires_parameters.
       merge({
               uuid: {
-                type: 'string', required: false, default: nil,
+                type: 'string', required: false, default: '',
               },
               recursive: {
                 type: 'boolean', required: false, default: false, description: 'Include contents from child groups recursively.',
@@ -104,7 +104,6 @@ class Arvados::V1::GroupsController < ApplicationController
   def destroy
     if !TRASHABLE_CLASSES.include?(@object.group_class)
       return @object.destroy
-      show
     else
       super # Calls destroy from TrashableController module
     end