From 32a35130175b483f5609bcf37f2fc7022f65d073 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Thu, 21 May 2015 16:37:21 -0500
Subject: [PATCH] search: Fix search queue missing results on nav link
This fixes a bug where the search queue would be empty when accessing it via
the navigation link
---
include/staff/tickets.inc.php | 2 --
scp/js/scp.js | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index b0d5fd38e..4b52fbe4e 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -149,8 +149,6 @@ case 'open':
}
// Apply primary ticket status
-if (!isset($status) && isset($_GET['status']))
- $status = $_GET['status'];
if ($status)
$tickets->filter(array('status__state'=>$status));
diff --git a/scp/js/scp.js b/scp/js/scp.js
index fd1017184..437ce5f6f 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -861,7 +861,6 @@ getConfig = (function() {
})();
$(document).on('pjax:click', function(options) {
- clearInterval(window.ticket_refresh);
// Release ticket lock (maybe)
if ($.autoLock !== undefined)
$.autoLock.releaseLock();
@@ -885,6 +884,8 @@ $(document).on('pjax:start', function() {
$.toggleOverlay(false);
// Close tooltips
$('.tip_box').remove();
+ // Cancel refreshes
+ clearInterval(window.ticket_refresh);
});
$(document).on('pjax:send', function(event) {
--
GitLab