* [MOD] Updated JQuery UI to latest version.

* [FIX] Fixed global search issues.
This commit is contained in:
nuxsmin
2015-07-18 14:33:23 +02:00
parent eb9e62a9ae
commit 9f00a62a39
36 changed files with 114 additions and 65 deletions

View File

@@ -53,7 +53,7 @@ class SearchC extends Controller implements ActionsInterface
private function setVars()
{
$this->view->assign('isAdmin', (\SP\Session::getUserIsAdminApp() || \SP\Session::getUserIsAdminAcc()));
$this->view->assign('globalSearch', \SP\Config::getValue('globalsearch', 0));
$this->view->assign('showGlobalSearch', \SP\Config::getValue('globalsearch', false));
// Comprobar si está creado el objeto de búsqueda en la sesión
if (!is_object(\SP\Session::getSearchFilters())) {
@@ -69,7 +69,7 @@ class SearchC extends Controller implements ActionsInterface
$this->view->assign('searchCustomer', \SP\Request::analyze('customer', $filters->getCustomerId()));
$this->view->assign('searchCategory', \SP\Request::analyze('category', $filters->getCategoryId()));
$this->view->assign('searchTxt', \SP\Request::analyze('search', $filters->getTxtSearch()));
$this->view->assign('searchGlobal', \SP\Request::analyze('gsearch', $filters->isGlobalSearch(), false, 1));
$this->view->assign('searchGlobal', \SP\Request::analyze('gsearch', $filters->getGlobalSearch()));
$this->view->assign('limitStart', \SP\Request::analyze('start', $filters->getLimitStart()));
$this->view->assign('limitCount', \SP\Request::analyze('rpp', $filters->getLimitCount()));
}
@@ -96,7 +96,7 @@ class SearchC extends Controller implements ActionsInterface
$search = new \SP\AccountSearch();
$search->setGlobalSearch($this->view->globalSearch);
$search->setGlobalSearch($this->view->searchGlobal);
$search->setTxtSearch($this->view->searchTxt);
$search->setCategoryId($this->view->searchCategory);
$search->setCustomerId($this->view->searchCustomer);