From c0b26f00ce877c40f44d8eb86d365b8d10784b3f Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@enhancesoft.com>
Date: Fri, 20 Mar 2015 03:00:53 +0000
Subject: [PATCH] bug: Support quick user filter
Support filtering search results by uid.
---
include/staff/tickets.inc.php | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index f8013df25..293acca9a 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -59,12 +59,7 @@ case 'search':
)));
}
break;
- }
- elseif (isset($_GET['uid'])) {
- // Apply user filter
- $tickets->filter(array('user__id'=>$_GET['uid']));
- }
- elseif (isset($_SESSION['advsearch'])) {
+ } elseif (isset($_SESSION['advsearch'])) {
// XXX: De-duplicate and simplify this code
$form = $search->getFormFromSession('advsearch');
$form->loadState($_SESSION['advsearch']);
@@ -87,6 +82,12 @@ case 'open':
break;
}
+// Apply user filter
+if (isset($_GET['uid'])) {
+ $tickets->filter(array('user__id'=>$_GET['uid']));
+}
+
+
// Apply primary ticket status
if ($status)
$tickets->filter(array('status__state'=>$status));
--
GitLab