projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '10312-nodemanager-quotas' refs #10312
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
pipeline_instances_controller.rb
diff --git
a/apps/workbench/app/controllers/pipeline_instances_controller.rb
b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index d68c5795d012f6703ea96e6944fedac12388ed18..a7b9142f0df3daa7fcb7a7dbeac1034a23723b24 100644
(file)
--- a/
apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/
apps/workbench/app/controllers/pipeline_instances_controller.rb
@@
-341,6
+341,15
@@
class PipelineInstancesController < ApplicationController
@unreadable_inputs_present
end
+ def cancel
+ @object.cancel
+ if params[:return_to]
+ redirect_to params[:return_to]
+ else
+ redirect_to @object
+ end
+ end
+
protected
def for_comparison v
if v.is_a? Hash or v.is_a? Array