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

Fixed the count of ok agents in the group view into the treeview

This commit is contained in:
mdtrooper 2014-12-04 16:31:00 +01:00
parent 70616b04cb
commit b711dcdd34
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_groups.php
View File

@ -1189,6 +1189,8 @@ function groups_agent_total($group_array) {
WHERE tagente.disabled = 0 WHERE tagente.disabled = 0
AND id_grupo IN $group_clause"); AND id_grupo IN $group_clause");
return $count > 0 ? $count : 0; return $count > 0 ? $count : 0;
} }
@ -1210,9 +1212,10 @@ function groups_agent_ok ($group_array) {
FROM tagente FROM tagente
WHERE tagente.disabled = 0 WHERE tagente.disabled = 0
AND normal_count = total_count AND normal_count = total_count
AND (notinit_count != 0)
AND id_grupo IN $group_clause"); AND id_grupo IN $group_clause");
return $count > 0 ? $count : 0; return $count > 0 ? $count : 0;
} }
@ -1627,6 +1630,7 @@ function groups_get_tree(&$groups, $parent = false) {
return $return; return $return;
} }
function groups_get_all_hierarchy_group ($id_group, $hierarchy = array()) { function groups_get_all_hierarchy_group ($id_group, $hierarchy = array()) {
global $config; global $config;

4
pandora_console/include/functions_treeview.php
View File

@ -619,6 +619,8 @@ function treeview_getData ($type) {
return array (); return array ();
} }
$fgroups = array(); $fgroups = array();
foreach ($full_groups as $fg) { foreach ($full_groups as $fg) {
@ -830,7 +832,7 @@ function treeview_getData ($type) {
$list = array(); $list = array();
} }
array_push($list, array('id_mg' => 0, 'name' => 'Not assigned')); array_push($list, array('id_mg' => 0, 'name' => 'Not assigned'));
break; break;
case 'policies': case 'policies':