2872: Merge branch 'master' into 2872-folder-nav

[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 ccbd06f85ddd6e5bf1eb800c39929d522f997ffc..a4a9d69bef8205c7df6fd652546f52fd9ad0b6a7 100644 (file)
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -40,7 +40,9 @@ class PipelineInstancesController < ApplicationController
   end
 
   def graph(pipelines)
-    count = {}    
+    return nil, nil if params['tab_pane'] != "Graph"
+
+    count = {}
     provenance = {}
     pips = {}
     n = 1
@@ -79,7 +81,7 @@ class PipelineInstancesController < ApplicationController
         pips[uuid] = 0 unless pips[uuid] != nil
         pips[uuid] |= n
       end
-      
+
       n = n << 1
     end
 
@@ -96,13 +98,15 @@ class PipelineInstancesController < ApplicationController
     end
 
     provenance, pips = graph(@pipelines)
+    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
 
-    @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 }
     super
   end
 
@@ -171,7 +175,7 @@ class PipelineInstancesController < ApplicationController
 
     @prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
       :request => request,
-      :all_script_parameters => true, 
+      :all_script_parameters => true,
       :combine_jobs => :script_and_version,
       :script_version_nodes => true,
       :pips => pips }
@@ -189,9 +193,9 @@ class PipelineInstancesController < ApplicationController
     panes
   end
 
-  def compare_pane_list 
+  def compare_pane_list
     %w(Compare Graph)
-  end 
+  end
 
   def index
     @limit = 20