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 83fe0dda4645a0437a962aa95e9572c9c897afe2..a7b9142f0df3daa7fcb7a7dbeac1034a23723b24 100644
(file)
--- a/
apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/
apps/workbench/app/controllers/pipeline_instances_controller.rb
@@
-188,6
+188,7
@@
class PipelineInstancesController < ApplicationController
if provenance
@prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
:request => request,
if provenance
@prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
:request => request,
+ :direction => :top_down,
:all_script_parameters => true,
:combine_jobs => :script_and_version,
:pips => pips,
:all_script_parameters => true,
:combine_jobs => :script_and_version,
:pips => pips,
@@
-340,6
+341,15
@@
class PipelineInstancesController < ApplicationController
@unreadable_inputs_present
end
@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
protected
def for_comparison v
if v.is_a? Hash or v.is_a? Array