From 3ddd9521253138d99b76b3ac43a3214c53549bac Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Wed, 20 May 2015 15:44:13 -0500
Subject: [PATCH] search: Fix incorrect basic ticket search results
---
include/staff/tickets.inc.php | 6 ++++--
scp/js/scp.js | 4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index 3eb5ad822..b0d5fd38e 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -77,7 +77,7 @@ case 'search':
if ($_REQUEST['query']) {
$results_type=__('Search Results');
// Use an index if possible
- if (Validator::is_email($_REQUEST['query'])) {
+ if ($_REQUEST['search-type'] == 'email') {
$tickets = $tickets->filter(array(
'user__emails__address' => $_REQUEST['query'],
));
@@ -314,7 +314,9 @@ return false;">
<tr>
<td><input type="search" id="basic-ticket-search" name="query"
autofocus size="30" value="<?php echo Format::htmlchars($_REQUEST['query'], true); ?>"
- autocomplete="off" autocorrect="off" autocapitalize="off"></td>
+ autocomplete="off" autocorrect="off" autocapitalize="off">
+ <input type="hidden" name="search-type" value=""/>
+ </td>
<td><input type="submit" class="button" value="<?php echo __('Search'); ?>"></td>
<td> <a href="#" onclick="javascript:
$.dialog('ajax.php/tickets/search', 201);"
diff --git a/scp/js/scp.js b/scp/js/scp.js
index 6853a93d7..e3c36457e 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -260,8 +260,10 @@ var scp_prep = function() {
});
},
onselect: function (obj) {
+ var form = $('#basic-ticket-search').closest('form');
+ form.find('input[name=search-type]').val('email');
$('#basic-ticket-search').val(obj.value);
- $('#basic-ticket-search').closest('form').submit();
+ form.submit();
},
property: "matches"
});
--
GitLab