From aea2b7c0f6f3b27200a20f689b7aecd1c890f8dc Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Thu, 2 Jun 2016 20:06:31 -0700
Subject: [PATCH] queue: Fix search by user email address
---
include/class.forms.php | 6 +++---
include/class.user.php | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/include/class.forms.php b/include/class.forms.php
index 7ec38ab92..931514d85 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -918,9 +918,9 @@ class FormField {
return array(
'set' => null,
'nset' => null,
- 'equal' => array('TextboxField', array()),
- 'nequal' => array('TextboxField', array()),
- 'contains' => array('TextboxField', array()),
+ 'equal' => array('TextboxField', array('configuration' => array('size' => 40))),
+ 'nequal' => array('TextboxField', array('configuration' => array('size' => 40))),
+ 'contains' => array('TextboxField', array('configuration' => array('size' => 40))),
'match' => array('TextboxField', array(
'placeholder' => __('Valid regular expression'),
'configuration' => array('size'=>30),
diff --git a/include/class.user.php b/include/class.user.php
index dbabea18d..e4cadc37f 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -368,6 +368,9 @@ implements TemplateVariable, Searchable {
$base = array();
foreach ($uform->getFields() as $F) {
$fname = $F->get('name') ?: ('field_'.$F->get('id'));
+ # XXX: email in the model corresponds to `emails__address` ORM path
+ if ($fname == 'email')
+ $fname = 'emails__address';
if (!$F->hasData() || $F->isPresentationOnly())
continue;
if (!$F->isStorable())
--
GitLab