X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/de758e3ecf76410ec43ad9f39fd9dbe750de637d..57991d19a58903863194043717b2875417a40fe7:/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 eb9bac0fa9..b4cce9be03 100644 --- a/apps/workbench/app/controllers/pipeline_instances_controller.rb +++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb @@ -1,6 +1,11 @@ class PipelineInstancesController < ApplicationController skip_before_filter :find_object_by_uuid, only: :compare before_filter :find_objects_by_uuid, only: :compare + skip_around_filter :require_thread_api_token, if: proc { |ctrl| + Rails.configuration.anonymous_user_token and + 'show' == ctrl.action_name + } + include PipelineInstancesHelper include PipelineComponentsHelper @@ -174,12 +179,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 +261,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