tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-05-09 Vanessa Gil <vanessa.gil@artica.es>

Browse Source 
*  operation/agentes/estado_agente.php: Fixed a mistake of my last 
	commit.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4323 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2011-05-09 15:38:22 +00:00
parent b46f148553
commit 2969d727cb
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2011-05-09 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/estado_agente.php: Fixed a mistake of my last
commit.
2011-05-09 Javier Lanz <javier.lanz@artica.es> 2011-05-09 Javier Lanz <javier.lanz@artica.es>
* include/graphs/fgraph.php: Added 'period' parameter to slicesbar_graph * include/graphs/fgraph.php: Added 'period' parameter to slicesbar_graph
@ -36,6 +43,7 @@
* pandoradb.postgreSQL.sql: fixed the type of cell "id_agente_modulo" in the * pandoradb.postgreSQL.sql: fixed the type of cell "id_agente_modulo" in the
table "tagente_datos_string". table "tagente_datos_string".
>>>>>>> .r4322
2011-05-06 Dario Rodriguez <dario.rodriguez@artica.es> 2011-05-06 Dario Rodriguez <dario.rodriguez@artica.es>
* include/graphs/functions_gd.php: Added new parameter to function * include/graphs/functions_gd.php: Added new parameter to function

5
pandora_console/operation/agentes/estado_agente.php
View File

@ -237,6 +237,11 @@ switch ($sortField) {
break; break;
} }
$search_sql = '';
if ($search != ""){
$search_sql = " AND ( nombre COLLATE utf8_general_ci LIKE '%$search%' OR direccion LIKE '%$search%') ";
}
// Show only selected groups // Show only selected groups
if ($group_id > 0) { if ($group_id > 0) {
$groups = $group_id; $groups = $group_id;