Merge branch 'master' into 8286-fav-projects

[arvados.git] / apps / workbench / app / controllers / jobs_controller.rb

diff --git a/apps/workbench/app/controllers/jobs_controller.rb b/apps/workbench/app/controllers/jobs_controller.rb
index 9090d6404aac4b49f32f1414933cf598a46a37c5..398417734c71c34f2aaac71fbf700eaf4d5f50d1 100644 (file)
--- a/apps/workbench/app/controllers/jobs_controller.rb
+++ b/apps/workbench/app/controllers/jobs_controller.rb
@@ -1,9 +1,8 @@
 class JobsController < ApplicationController
-  if Rails.configuration.anonymous_user_token
-    skip_around_filter :require_thread_api_token, only: :show
-  end
-
-  include JobsHelper
+  skip_around_filter :require_thread_api_token, if: proc { |ctrl|
+    Rails.configuration.anonymous_user_token and
+    'show' == ctrl.action_name
+  }
 
   def generate_provenance(jobs)
     return if params['tab_pane'] != "Provenance"
@@ -84,8 +83,6 @@ class JobsController < ApplicationController
   end
 
   def show_pane_list
-    panes = %w(Status Log Details Provenance Advanced)
-    panes.delete 'Log' if !current_user
-    panes
+    %w(Status Log Details Provenance Advanced)
   end
 end