From 84b88010ca9cc0802a9d4810a1a83c2946c64573 Mon Sep 17 00:00:00 2001 From: Phil Hodgson Date: Sun, 14 Dec 2014 13:47:02 +0100 Subject: [PATCH] 4358: fixed: the provenance graph was being generated twice, the second time for only one pipeline --- .../pipeline_instances_controller.rb | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb index eb9bac0fa9..25f5ee421c 100644 --- a/apps/workbench/app/controllers/pipeline_instances_controller.rb +++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb @@ -174,12 +174,9 @@ class PipelineInstancesController < ApplicationController end def show - @pipelines = [@object] - - if params[:compare] - PipelineInstance.where(uuid: params[:compare]).each do |p| - @pipelines << p - end + # the #show action can also be called by #compare, which does its own work to set up @pipelines + unless defined? @pipelines + @pipelines = [@object] end provenance, pips = graph(@pipelines) @@ -259,18 +256,7 @@ class PipelineInstancesController < ApplicationController end if params['tab_pane'] == "Graph" - provenance, pips = graph(@objects) - @pipelines = @objects - - if provenance - @prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", { - :request => request, - :all_script_parameters => true, - :combine_jobs => :script_and_version, - :script_version_nodes => true, - :pips => pips } - end end @object = @objects.first -- 2.30.2