X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6e43023a9bae34280b2ce364a0adf67f16305615..39cfbff065282869d8dadab2474dfaae4ba0b86a:/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 685d13d1b5..e5c71cb275 100644
--- a/apps/workbench/app/controllers/jobs_controller.rb
+++ b/apps/workbench/app/controllers/jobs_controller.rb
@@ -1,5 +1,12 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class JobsController < ApplicationController
-  include JobsHelper
+  skip_around_action :require_thread_api_token, if: proc { |ctrl|
+    !Rails.configuration.Users.AnonymousUserToken.empty? and
+    'show' == ctrl.action_name
+  }
 
   def generate_provenance(jobs)
     return if params['tab_pane'] != "Provenance"
@@ -17,11 +24,11 @@ class JobsController < ApplicationController
       nodes[j[:script_version]] = {:uuid => j[:script_version]}
     end
 
-    Collection.where(uuid: collections).each do |c|
+    Collection.where(uuid: collections).with_count("none").each do |c|
       nodes[c[:portable_data_hash]] = c
     end
 
-    Collection.where(portable_data_hash: hashes).each do |c|
+    Collection.where(portable_data_hash: hashes).with_count("none").each do |c|
       nodes[c[:portable_data_hash]] = c
     end
 
@@ -58,14 +65,9 @@ class JobsController < ApplicationController
   end
 
   def logs
-    @logs = Log.select(%w(event_type object_uuid event_at properties))
-               .order('event_at DESC')
-               .filter([["event_type",  "=", "stderr"],
-                        ["object_uuid", "in", [@object.uuid]]])
-               .limit(500)
-               .results
-               .to_a
-               .map{ |e| e.serializable_hash.merge({ 'prepend' => true }) }
+    @logs = @object.
+      stderr_log_query(Rails.configuration.Workbench.RunningJobLogRecordsToFetch).
+      map { |e| e.serializable_hash.merge({ 'prepend' => true }) }
     respond_to do |format|
       format.json { render json: @logs }
     end
@@ -82,33 +84,4 @@ class JobsController < ApplicationController
   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
-  end
 end