Browse Source

do not refresh except on page 1

Andrew Cantino 10 years ago
parent
commit
630f614aa0

+ 3 - 2
app/assets/javascripts/components/worker-checker.js.coffee

@@ -41,8 +41,9 @@ $ ->
         sinceId ?= json.max_id
         currentJobs = [json.pending, json.awaiting_retry, json.recent_failures]
         if document.location.pathname == '/jobs' && $(".modal[aria-hidden=false]").length == 0 && previousJobs? && previousJobs.join(',') != currentJobs.join(',')
-          $.get '/jobs', (data) =>
-            $("#main-content").html(data)
+          if !document.location.search || document.location.search == '?page=1'
+            $.get '/jobs', (data) =>
+              $("#main-content").html(data)
         previousJobs = currentJobs
 
         window.workerCheckTimeout = setTimeout check, 2000

+ 1 - 0
app/controllers/jobs_controller.rb

@@ -49,6 +49,7 @@ class JobsController < ApplicationController
   end
 
   private
+
   def running?
     (@job.locked_at || @job.locked_by) && @job.failed_at.nil?
   end