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

2014-06-05 Sergio Martin <sergio.martin@artica.es> 

* operation/agentes/ver_agente.php: Fix sql error in the layer that 
	appears when put the mouse over a node in network map related with tags
	in users without acl profiles assigned (just admin assigned) Ticket #824




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10125 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2014-06-06 06:50:58 +00:00
parent d35e1b69fb
commit 3246212a0d
2 changed files with 9 additions and 2 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 @@
2014-06-05 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/ver_agente.php: Fix sql error in the layer that
appears when put the mouse over a node in network map related with tags
in users without acl profiles assigned (just admin assigned) Ticket #824
2014-06-05 Sergio Martin <sergio.martin@artica.es>
* operation/search_agents.php: Change the format of the agent interval

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

@ -473,8 +473,9 @@ if (is_ajax ()) {
$_tags = implode(',', array_keys($_user_tags));
$_sql_post .= ' AND tagente_modulo.id_agente_modulo IN (SELECT a.id_agente_modulo FROM tagente_modulo a, ttag_module b WHERE a.id_agente_modulo=b.id_agente_modulo AND b.id_tag IN (' . $_tags . ')) ';
if (!empty($_tags)) {
$_sql_post .= ' AND tagente_modulo.id_agente_modulo IN (SELECT a.id_agente_modulo FROM tagente_modulo a, ttag_module b WHERE a.id_agente_modulo=b.id_agente_modulo AND b.id_tag IN (' . $_tags . ')) ';
}
}
$sql = sprintf ('SELECT tagente_modulo.descripcion,