From 2273e2dbaa3e0dc2be4c3dec5f2eb6eb2f797646 Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Tue, 21 Feb 2012 14:09:21 +0000 Subject: [PATCH] Don't trigger a full search when the entered text is empty ! SVN:1.2.1[1866] --- pages/ajax.render.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pages/ajax.render.php b/pages/ajax.render.php index ac8957e3b..b21ab2bfe 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -235,18 +235,21 @@ try $sFilter = utils::ReadParam('sFilter', '', false, 'raw_data'); $sJson = utils::ReadParam('json', '', false, 'raw_data'); $sContains = utils::ReadParam('q', '', false, 'raw_data'); - if (!empty($sJson)) + if ($sContains !='') { - $oWizardHelper = WizardHelper::FromJSON($sJson); - $oObj = $oWizardHelper->GetTargetObject(); + if (!empty($sJson)) + { + $oWizardHelper = WizardHelper::FromJSON($sJson); + $oObj = $oWizardHelper->GetTargetObject(); + } + else + { + // Search form: no current object + $oObj = null; + } + $oWidget = new UIExtKeyWidget($sTargetClass, $iInputId); + $oWidget->AutoComplete($oPage, $sFilter, $oObj, $sContains); } - else - { - // Search form: no current object - $oObj = null; - } - $oWidget = new UIExtKeyWidget($sTargetClass, $iInputId); - $oWidget->AutoComplete($oPage, $sFilter, $oObj, $sContains); break; // ui.extkeywidget