projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
18995: proper fix for group class destroy method. Add a test.
[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 8539332f16509a6f00a6e9e27617d16a2ef75e45..3473c7e4e0c361e3c594569f83178e2ea18ebed2 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/groups_controller.rb
@@
-103,7
+103,8
@@
class Arvados::V1::GroupsController < ApplicationController
def destroy
if !TRASHABLE_CLASSES.include?(@object.group_class)
- return @object.destroy
+ @object.destroy
+ show
else
super # Calls destroy from TrashableController module
end