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 

(cherry picked from commit b711dcdd34)

Conflicts:
	pandora_console/include/functions_groups.php
This commit is contained in:
mdtrooper 2014-12-04 16:31:00 +01:00
parent 03adf3f9d6
commit 7a139c394e
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/include/functions_groups.php
View File

@ -1189,6 +1189,8 @@ function groups_agent_total($group_array) {
WHERE tagente.disabled = 0
AND id_grupo IN $group_clause");
return $count > 0 ? $count : 0;
}
@ -1207,7 +1209,13 @@ function groups_agent_ok ($group_array) {
$group_clause = implode (",", $group_array);
$group_clause = "(" . $group_clause . ")";
$count = db_get_sql ("SELECT COUNT(*) FROM tagente WHERE tagente.disabled=0 AND normal_count=total_count AND id_grupo IN $group_clause");
$count = db_get_sql ("SELECT COUNT(*)
FROM tagente
WHERE tagente.disabled = 0
AND normal_count = total_count
AND id_grupo IN $group_clause");
return $count > 0 ? $count : 0;
}
@ -1623,6 +1631,7 @@ function groups_get_tree(&$groups, $parent = false) {
return $return;
}
function groups_get_all_hierarchy_group ($id_group, $hierarchy = array()) {
global $config;

2
pandora_console/include/functions_treeview.php
View File

@ -619,6 +619,8 @@ function treeview_getData ($type) {
return array ();
}
$fgroups = array();
foreach ($full_groups as $fg) {