From e5ee8ab14297b58b12d26d8bae0fdfc34fc1411d Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Tue, 21 Jan 2014 14:08:39 -0600
Subject: [PATCH] Fixup querying drop-down lists via advanced search
It turns out that the _id field was not added to the cdata table when it was
created for SelectionField items, because the ::hasIdValue() method was not
implemented. This patch correctly searches SelectionFields via advanced
search.
---
include/ajax.tickets.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/ajax.tickets.php b/include/ajax.tickets.php
index b613144f4..22af61cb3 100644
--- a/include/ajax.tickets.php
+++ b/include/ajax.tickets.php
@@ -213,9 +213,10 @@ class TicketsAjaxAPI extends AjaxController {
&& ($val = $req[$f->getFormName()])) {
$name = $f->get('name') ? $f->get('name')
: 'field_'.$f->get('id');
- $cwhere = "cdata.`$name` LIKE '%".db_real_escape($val)."%'";
if ($f->getImpl()->hasIdValue() && is_numeric($val))
- $cwhere .= " OR cdata.`{$name}_id` = ".db_input($val);
+ $cwhere = "cdata.`{$name}_id` = ".db_input($val);
+ else
+ $cwhere = "cdata.`$name` LIKE '%".db_real_escape($val)."%'";
$where .= ' AND ('.$cwhere.')';
$cdata_search = true;
}
@@ -232,7 +233,8 @@ class TicketsAjaxAPI extends AjaxController {
$sections[] = "$select $from $where";
$sql=implode(' union ', $sections);
- $res = db_query($sql);
+ if (!($res = db_query($sql)))
+ return TicketForm::dropDynamicDataView();
$tickets = array();
while ($row = db_fetch_row($res))
--
GitLab