projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18947-keepproxy'
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
projects_controller.rb
diff --git
a/apps/workbench/app/controllers/projects_controller.rb
b/apps/workbench/app/controllers/projects_controller.rb
index b649b710b01598d73c3c53f19a54df2152dd75aa..e448e1b4530d78b1cfad3ec124ccc26fcd6e3583 100644
(file)
--- a/
apps/workbench/app/controllers/projects_controller.rb
+++ b/
apps/workbench/app/controllers/projects_controller.rb
@@
-133,7
+133,7
@@
class ProjectsController < ApplicationController
def remove_items
@removed_uuids = []
params[:item_uuids].collect { |uuid| ArvadosBase.find uuid }.each do |item|
def remove_items
@removed_uuids = []
params[:item_uuids].collect { |uuid| ArvadosBase.find uuid }.each do |item|
- if item.class == Collection or item.class == Group
+ if item.class == Collection or item.class == Group
or item.class == Workflow or item.class == ContainerRequest
# Use delete API on collections and projects/groups
item.destroy
@removed_uuids << item.uuid
# Use delete API on collections and projects/groups
item.destroy
@removed_uuids << item.uuid
@@
-163,7
+163,7
@@
class ProjectsController < ApplicationController
def destroy
while (objects = Link.filter([['owner_uuid','=',@object.uuid],
def destroy
while (objects = Link.filter([['owner_uuid','=',@object.uuid],
- ['tail_uuid','=',@object.uuid]])).any?
+ ['tail_uuid','=',@object.uuid]])
.with_count("none")
).any?
objects.each do |object|
object.destroy
end
objects.each do |object|
object.destroy
end