tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-11-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/ajax/agent.php
	operation/agentes/exportdata.php: Fixed agent autocomplete 
	functionality.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5212 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-11-30 11:26:25 +00:00
parent 3757027dbd
commit 4a0d1a10e0
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2011-11-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/ajax/agent.php
operation/agentes/exportdata.php: Fixed agent autocomplete
functionality.
2011-11-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php: Fixed html render of combined

7
pandora_console/include/ajax/agent.php
View File

@ -33,7 +33,7 @@ if ($search_agents && ($config['metaconsole'] == 0)) {
$id_agent = (int) get_parameter ('id_agent');
$string = (string) get_parameter ('q'); /* q is what autocomplete plugin gives */
$id_group = (int) get_parameter('id_group');
$id_group = get_parameter('id_group', -1);
$addedItems = html_entity_decode((string) get_parameter('add'));
$addedItems = json_decode($addedItems);
@ -53,8 +53,9 @@ if ($search_agents && ($config['metaconsole'] == 0)) {
$filter[] = '(UPPER(nombre) LIKE UPPER(\'%'.$string.'%\') OR UPPER(direccion) LIKE UPPER(\'%'.$string.'%\') OR UPPER(comentarios) LIKE UPPER(\'%'.$string.'%\'))';
break;
}
$filter['id_grupo'] = $id_group;
if ($id_group != -1)
$filter['id_grupo'] = $id_group;
$agents = agents_get_agents ($filter, array ('id_agente','nombre', 'direccion'));
if ($agents === false)

6
pandora_console/operation/agentes/exportdata.php
View File

@ -24,7 +24,7 @@ if (is_ajax ()) {
$id_agent = (int) get_parameter ('id_agent');
$string = (string) get_parameter ('q'); /* q is what autocomplete plugin gives */
$id_group = (int) get_parameter('id_group');
$id_group = (int) get_parameter('id_group', -1);
$addedItems = html_entity_decode((string) get_parameter('add'));
$addedItems = json_decode($addedItems);
$all = (string)get_parameter('all', 'all');
@ -47,7 +47,9 @@ if (is_ajax ()) {
$filter[] = '(UPPER(nombre) LIKE UPPER(\'%'.$string.'%\') OR UPPER(direccion) LIKE UPPER(\'%'.$string.'%\') OR UPPER(comentarios) LIKE UPPER(\'%'.$string.'%\'))';
break;
}
$filter['id_grupo'] = $id_group;
if ($id_group != -1)
$filter['id_grupo'] = $id_group;
switch ($all) {
case 'enabled':