[ARVADOS] created: 84b88010ca9cc0802a9d4810a1a83c2946c64573

[git at public.curoverse.com]

        at  84b88010ca9cc0802a9d4810a1a83c2946c64573 (commit)


commit 84b88010ca9cc0802a9d4810a1a83c2946c64573
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date:   Sun Dec 14 13:47:02 2014 +0100

    4358: fixed: the provenance graph was being generated twice, the second time for only one pipeline

diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index eb9bac0..25f5ee4 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

-----------------------------------------------------------------------


hooks/post-receive
--