projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fd228a5)
12902: Offer Cancel button for "on hold" containers.
authorTom Clegg <tclegg@veritasgenetics.com>
Wed, 31 Jan 2018 15:17:21 +0000 (10:17 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Wed, 31 Jan 2018 15:18:55 +0000 (10:18 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

apps/workbench/app/models/container_work_unit.rb patch | blob | history

diff --git a/apps/workbench/app/models/container_work_unit.rb b/apps/workbench/app/models/container_work_unit.rb
index 103507a721b36efe43e19ac44b2e437e6d1bc432..dbc81c52a376940231094dbf4415e5625016814f 100644 (file)
--- 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