From f123bac91592536c856a03152dd03b2e0cb29061 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 10 Sep 2018 12:58:10 +0200
Subject: [PATCH 1/2] fixed total counters grouw view

---
 pandora_console/include/functions_groupview.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pandora_console/include/functions_groupview.php b/pandora_console/include/functions_groupview.php
index 4f86497563..15b4d577bf 100644
--- a/pandora_console/include/functions_groupview.php
+++ b/pandora_console/include/functions_groupview.php
@@ -110,12 +110,14 @@ function groupview_get_all_counters($tree_group) {
 			0 AS _id_,
 			'' AS _icon_
 		FROM $table ta
-		WHERE ta.id_agente
-			IN (
+		WHERE ta.disabled = 0
+			AND ta.id_agente IN (
 				SELECT ta.id_agente FROM $table ta
 				LEFT JOIN $table_sec tasg
 					ON ta.id_agente = tasg.id_agent
-				WHERE 1=1 $group_acl
+				WHERE ta.disabled = 0 
+					$group_acl
+				GROUP BY ta.id_agente
 			)
 	";
 	$data = db_get_row_sql($sql);
@@ -138,6 +140,8 @@ function groupview_get_groups_list($id_user = false, $access = 'AR', $is_not_pag
 		'statusModule' => -1,
 		'groupID' => 0,
 		'tagID' => 0,
+		'show_not_init_agents' => 1,
+		'show_not_init_modules' => 1
 	));
 	$info = $tree_group->getArray();
 	$info = groupview_plain_groups($info);

From 022adeb24d44dd7c30f0e584b50e0b9f34b7b8ad Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 10 Sep 2018 15:35:11 +0200
Subject: [PATCH 2/2] fixed metaconsole tree view popup modules

---
 pandora_console/include/class/Tree.class.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php
index bfad143ff0..1ef7129f9d 100644
--- a/pandora_console/include/class/Tree.class.php
+++ b/pandora_console/include/class/Tree.class.php
@@ -19,6 +19,7 @@ class Tree {
 	protected $id = -1;
 	protected $rootID = -1;
 	protected $serverID = false;
+	protected $serverName = '';
 	protected $tree = array();
 	protected $filter = array();
 	protected $childrenMethod = "on_demand";
@@ -50,6 +51,9 @@ class Tree {
 		$this->id = $id;
 		$this->rootID = !empty($rootID) ? $rootID : $id;
 		$this->serverID = $serverID;
+		if (is_metaconsole()) {
+			$this->serverName = metaconsole_get_server_by_id($serverID);
+		}
 		$this->childrenMethod = $childrenMethod;
 		$this->access = $access;
 
@@ -481,9 +485,9 @@ class Tree {
 		$module['status'] = $module['estado'];
 		$module['value'] = $module['datos'];
 
-		if (is_metaconsole() && !empty($server)) {
-			$module['serverID'] = $server['id'];
-			$module['serverName'] = $server['server_name'];
+		if (is_metaconsole()) {
+			$module['serverID'] = $this->serverID;
+			$module['serverName'] = $this->serverName;
 		}
 		else {
 			$module['serverName'] = false;
@@ -576,7 +580,7 @@ class Tree {
 					"refresh" => SECONDS_10MINUTES
 				);
 
-			if (is_metaconsole() && !empty($server)) {
+			if (is_metaconsole()) {
 				// Set the server id
 				$graph_params["server"] = $module['serverID'];
 			}