From 9359659d79a0c17265ff8a09e896920243a1b800 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 31 Jan 2018 10:17:21 -0500 Subject: [PATCH] 12902: Offer Cancel button for "on hold" containers. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- apps/workbench/app/models/container_work_unit.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/workbench/app/models/container_work_unit.rb b/apps/workbench/app/models/container_work_unit.rb index 103507a721..dbc81c52a3 100644 --- a/apps/workbench/app/models/container_work_unit.rb +++ b/apps/workbench/app/models/container_work_unit.rb @@ -58,7 +58,10 @@ class ContainerWorkUnit < ProxyWorkUnit end def can_cancel? - @proxied.is_a?(ContainerRequest) && @proxied.state == "Committed" && @proxied.priority > 0 && @proxied.editable? + @proxied.is_a?(ContainerRequest) && + @proxied.state == "Committed" && + (@proxied.priority > 0 || get(:state, @container) != 'Running') && + @proxied.editable? end def container_uuid -- 2.30.2