From 574098e4eefebcf47d8b55a355c339e470f9a6d4 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Wed, 29 Sep 2021 16:20:18 +0200
Subject: [PATCH] #8062 Fixed custom graph in metaconsole

---
 pandora_console/include/functions_graph.php      | 16 ++++++++--------
 .../models/VisualConsole/Items/ModuleGraph.php   |  5 ++++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 27c4ac083a..0aa219efab 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -1416,14 +1416,6 @@ function graphic_combined_module(
         $labels  = [];
         $modules = [];
         foreach ($sources as $source) {
-            $id_agent = agents_get_module_id(
-                $source['id_agent_module']
-            );
-
-            if (!$id_agent) {
-                continue;
-            }
-
             if (is_metaconsole() === true) {
                 metaconsole_restore_db();
                 $server = metaconsole_get_connection_by_id($source['id_server']);
@@ -1432,6 +1424,14 @@ function graphic_combined_module(
                 }
             }
 
+            $id_agent = agents_get_module_id(
+                $source['id_agent_module']
+            );
+
+            if (!$id_agent) {
+                continue;
+            }
+
             $modulepush = [
                 'server' => (isset($source['id_server']) === true) ? $source['id_server'] : 0,
                 'module' => $source['id_agent_module'],
diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php b/pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php
index cc0c365576..6f5a248a78 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php
@@ -612,6 +612,9 @@ final class ModuleGraph extends Item
 
             // Custom graph.
             $fields = self::getListCustomGraph();
+            $selected_custom_graph = (\is_metaconsole() === true)
+                ? $values['customGraphId'].'|'.$values['metaconsoleId']
+                : $values['customGraphId'];
             $inputs[] = [
                 'id'        => 'MGcustomGraph',
                 'hidden'    => $hiddenCustom,
@@ -620,7 +623,7 @@ final class ModuleGraph extends Item
                     'type'          => 'select',
                     'fields'        => $fields,
                     'name'          => 'customGraphId',
-                    'selected'      => $values['customGraphId'],
+                    'selected'      => $selected_custom_graph,
                     'return'        => true,
                     'nothing'       => __('None'),
                     'nothing_value' => 0,