CC-6050: User management bugfix
This commit is contained in:
parent
b81069ace3
commit
b5b3d96b48
|
@ -95,7 +95,6 @@ class UserController extends Zend_Controller_Action
|
||||||
public function getHostsAction()
|
public function getHostsAction()
|
||||||
{
|
{
|
||||||
$search = $this->_getParam('term');
|
$search = $this->_getParam('term');
|
||||||
$res = Application_Model_User::getHosts($search);
|
|
||||||
$this->view->hosts = Application_Model_User::getHosts($search);
|
$this->view->hosts = Application_Model_User::getHosts($search);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -263,7 +263,6 @@ class Application_Model_User
|
||||||
$con = Propel::getConnection();
|
$con = Propel::getConnection();
|
||||||
|
|
||||||
$sql_gen = "SELECT login AS value, login AS label, id as index FROM cc_subjs ";
|
$sql_gen = "SELECT login AS value, login AS label, id as index FROM cc_subjs ";
|
||||||
$sql = $sql_gen;
|
|
||||||
|
|
||||||
$types = array();
|
$types = array();
|
||||||
$params = array();
|
$params = array();
|
||||||
|
@ -277,13 +276,8 @@ class Application_Model_User
|
||||||
|
|
||||||
$sql = $sql_gen ." WHERE (". $sql_type.") ";
|
$sql = $sql_gen ." WHERE (". $sql_type.") ";
|
||||||
|
|
||||||
if (!is_null($search)) {
|
$sql .= " AND login ILIKE :search";
|
||||||
//need to use addslashes for 'LIKE' values
|
$params[":search"] = "%$search%";
|
||||||
$search = addslashes($search);
|
|
||||||
$like = "login ILIKE '%{$search}%'";
|
|
||||||
|
|
||||||
$sql = $sql . " AND ".$like;
|
|
||||||
}
|
|
||||||
|
|
||||||
$sql = $sql ." ORDER BY login";
|
$sql = $sql ." ORDER BY login";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue