From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Wed, 31 Jan 2018 15:17:21 +0000 (-0500)
Subject: 12902: Offer Cancel button for "on hold" containers.
X-Git-Tag: 1.1.3~4^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/9359659d79a0c17265ff8a09e896920243a1b800

12902: Offer Cancel button for "on hold" containers.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---

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