Merge branch '9180-avoid-overreplication-keepclient'

[arvados.git] / apps / workbench / app / controllers / container_requests_controller.rb

diff --git a/apps/workbench/app/controllers/container_requests_controller.rb b/apps/workbench/app/controllers/container_requests_controller.rb
index 94cc5139fb3c74c1ef888805e7c646b9e5d0619c..4a32cd8171c53ffa64d17a1e4640abb7ca837bf6 100644 (file)
--- a/apps/workbench/app/controllers/container_requests_controller.rb
+++ b/apps/workbench/app/controllers/container_requests_controller.rb
@@ -1,2 +1,14 @@
 class ContainerRequestsController < ApplicationController
+  def show_pane_list
+    %w(Status Log Advanced)
+  end
+
+  def cancel
+    @object.update_attributes! priority: 0
+    if params[:return_to]
+      redirect_to params[:return_to]
+    else
+      redirect_to @object
+    end
+  end
 end