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

Uploaded lost changes from the last day

This commit is contained in:
mdtrooper 2014-12-19 11:58:06 +01:00
parent fa475c38f4
commit 41ed17cfe2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/class/Tree.class.php
View File

@ -94,6 +94,8 @@ class Tree {
foreach ($groups as $iterator => $group) {
$data = reporting_get_group_stats($group['id_grupo']);
$groups[$iterator]['icon'] = groups_get_icon($group['id_grupo']) . '.png';
$groups[$iterator]['counters'] = array();
$groups[$iterator]['counters']['unknown'] = $data['agents_unknown'];
@ -184,6 +186,7 @@ class Tree {
$temp['id'] = $item['id'];
$temp['type'] = $item['type'];
$temp['name'] = $item['name'];
$temp['icon'] = $item['icon'];
$temp['status'] = $item['status'];
switch ($this->countAgentStatusMethod) {
case 'on_demand':

8
pandora_console/include/functions_groups.php
View File

@ -401,12 +401,16 @@ function groups_get_icon ($id_group) {
function groups_get_all($groupWithAgents = false) {
global $config;
$sql = 'SELECT id_grupo, nombre FROM tgrupo';
$sql = 'SELECT id_grupo, nombre
FROM tgrupo';
global $config;
if ($groupWithAgents)
$sql .= ' WHERE id_grupo IN (SELECT id_grupo FROM tagente GROUP BY id_grupo)';
$sql .= ' WHERE id_grupo IN (
SELECT id_grupo
FROM tagente
GROUP BY id_grupo)';
switch ($config['dbtype']) {
case "mysql":