Merge branch '2659-anonymous-share-projects' refs #2659

[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 685d13d1b550e628d65a1d6ef18851e288c7360f..b90210f6a9b7be4c7bbea8a1193000ac9e8a7a56 100644 (file)
--- a/apps/workbench/app/controllers/jobs_controller.rb
+++ b/apps/workbench/app/controllers/jobs_controller.rb
@@ -1,4 +1,9 @@
 class JobsController < ApplicationController
+  skip_around_filter :require_thread_api_token, if: proc { |ctrl|
+    Rails.configuration.anonymous_user_token and
+    'show' == ctrl.action_name
+  }
+
   include JobsHelper
 
   def generate_provenance(jobs)
@@ -80,35 +85,8 @@ class JobsController < ApplicationController
   end
 
   def show_pane_list
-    %w(Status Log Details Provenance Advanced)
-  end
-
-  def rerun_job_with_options_popup
-    respond_to do |format|
-      format.js
-      format.html
-    end
-  end
-
-  def rerun_job_with_options
-    job_info = JSON.parse params['job_info']
-
-    @object = Job.new
-
-    @object.script = job_info['script']
-    @object.repository = job_info['repository']
-    @object.nondeterministic = job_info['nondeterministic']
-    @object.script_parameters = job_info['script_parameters']
-    @object.runtime_constraints = job_info['runtime_constraints']
-    @object.supplied_script_version = job_info['supplied_script_version']
-
-    if 'use_latest' == params['script']
-      @object.script_version = job_info['supplied_script_version']
-    else
-      @object.script_version = job_info['script_version']
-    end
-
-    @object.save!
-    show
+    panes = %w(Status Log Details Provenance Advanced)
+    panes.delete 'Log' if !current_user
+    panes
   end
 end