X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/56ad30382d7d4e11cb0160c5f2e30077e1f41c8b..5536864737f7729775f9b2ee95516d6df5053451:/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 b90210f6a9..c39b7c4317 100644 --- a/apps/workbench/app/controllers/jobs_controller.rb +++ b/apps/workbench/app/controllers/jobs_controller.rb @@ -4,8 +4,6 @@ class JobsController < ApplicationController 'show' == ctrl.action_name } - include JobsHelper - def generate_provenance(jobs) return if params['tab_pane'] != "Provenance" @@ -32,6 +30,7 @@ class JobsController < ApplicationController @svg = ProvenanceHelper::create_provenance_graph nodes, "provenance_svg", { :request => request, + :direction => :top_down, :all_script_parameters => true, :script_version_nodes => true} end @@ -63,14 +62,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.running_job_log_records_to_fetch). + map { |e| e.serializable_hash.merge({ 'prepend' => true }) } respond_to do |format| format.json { render json: @logs } end @@ -85,8 +79,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