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

Fixed error when selected in bulk actions agents edit any status, show all agents. Tiquet: #2261

This commit is contained in:
m-lopez-f 2015-06-01 13:36:43 +02:00
parent 73ae001a3f
commit 4147c9644c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ if (is_ajax ()) {
// if group ID doesn't matter and $privilege is specified (like 'AW'),
// retruns all agents that current user has $privilege privilege for.
$agents = agents_get_group_agents(
array_keys (users_get_groups ($config["id_user"], $privilege, false)));
array_keys (users_get_groups ($config["id_user"], $privilege, false)),$filter,"none",false,$recursion);
}
else {
$agents = agents_get_group_agents($id_group, $filter, "none",

3
pandora_console/include/functions_agents.php
View File

@ -859,7 +859,8 @@ function agents_get_group_agents ($id_group = 0, $search = false, $case = "lower
AND unknown_count > 0";
break;
case AGENT_STATUS_NOT_NORMAL:
$search_sql .= " AND normal_count <> total_count";
$search_sql .= " AND normal_count <> total_count AND
critical_count = 0 AND warning_count = 0";
break;
case AGENT_STATUS_NOT_INIT:
$search_sql .= " AND notinit_count = total_count";