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

2014-05-22 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* godmode/groups/group_list.php: Dont show void agents
        in report template wizard.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9986 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2014-05-22 13:22:27 +00:00
parent a93ddb9356
commit cb92d75167
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2014-05-22 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/groups/group_list.php: Dont show void agents
in report template wizard.
2014-05-22 Vanessa Gil <vanessa.gil@artica.es> 2014-05-22 Vanessa Gil <vanessa.gil@artica.es>
* godmode/setup/setup_visuals.php * godmode/setup/setup_visuals.php

11
pandora_console/godmode/groups/group_list.php
View File

@ -72,6 +72,8 @@ if (is_ajax ()) {
// Ids of agents to be include in the SQL clause as id_agent IN () // Ids of agents to be include in the SQL clause as id_agent IN ()
$filter_agents_json = (string) get_parameter ('filter_agents_json', ''); $filter_agents_json = (string) get_parameter ('filter_agents_json', '');
$status_agents = (int)get_parameter('status_agents', AGENT_STATUS_ALL); $status_agents = (int)get_parameter('status_agents', AGENT_STATUS_ALL);
// Juanma (22/05/2014) Fix: If setted remove void agents from result (by default and for compatibility show void agents)
$show_void_agents = (int)get_parameter('show_void_agents', 1);
if (! check_acl ($config['id_user'], $id_group, "AR")) { if (! check_acl ($config['id_user'], $id_group, "AR")) {
db_pandora_audit("ACL Violation", db_pandora_audit("ACL Violation",
@ -94,6 +96,15 @@ if (is_ajax ()) {
$filter['status'] = $status_agents; $filter['status'] = $status_agents;
} }
# Juanma (22/05/2014) Fix: If remove void agents setted
$_sql_post = ' 1=1 ';
if ($show_void_agents == 0) {
$_sql_post .= ' AND id_agente IN (SELECT a.id_agente FROM tagente a, tagente_modulo b WHERE a.id_agente=b.id_agente) AND \'1\'';
$filter[$_sql_post] = '1';
}
$agents = agents_get_group_agents($id_group, $filter, "none", $agents = agents_get_group_agents($id_group, $filter, "none",
false, $recursion); false, $recursion);