X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a4211acb465bd42869bf2a2f9fad6ff2c5e518e0..3b3c3a0869c2cf528b9e1c45c969bbbd47f6446e:/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 c5fbda0cf3..a7b9142f0d 100644 --- a/apps/workbench/app/controllers/pipeline_instances_controller.rb +++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb @@ -53,7 +53,7 @@ class PipelineInstancesController < ApplicationController end @object.state = 'New' - # set owner_uuid to that of source, provided it is a project and wriable by current user + # set owner_uuid to that of source, provided it is a project and writable by current user current_project = Group.find(source.owner_uuid) rescue nil if (current_project && current_project.writable_by.andand.include?(current_user.uuid)) @object.owner_uuid = source.owner_uuid @@ -188,6 +188,7 @@ class PipelineInstancesController < ApplicationController 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, @@ -340,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