From 60212dae50fa242dedb5da1983c59134798a5837 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 14 Nov 2018 16:38:44 +0100
Subject: [PATCH] fixed errors cv

---
 .../reporting/visual_console_builder.data.php |  4 +--
 .../visual_console_builder.editor.js          |  2 +-
 .../ajax/visual_console_builder.ajax.php      | 27 ++++++++++++++++---
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php
index f1ed16157d..1a620ae43f 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.data.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.data.php
@@ -195,10 +195,10 @@ html_print_submit_button ($textButtonSubmit, 'update_layout', false,
 echo '</div>';
 
 echo "</form>";
+ui_require_css_file ("color-picker");
+ui_require_jquery_file ("colorpicker");
 ?>
 
-<script src="include/javascript/jquery.colorpicker.js"></script>
-
 <script type="text/javascript">
 
 $(document).ready (function () {
diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index cada5a2f51..055762abc8 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -2616,7 +2616,7 @@ function setEventsBar(id_data, values) {
 	parameter.push ({name: "id_agent", value: values['id_agent']});
 	parameter.push ({name: "id_agent_module", value: values['module']});
 	if (is_metaconsole()) {
-		parameter.push ({name: "id_metaconsole", value: id_metaconsole});
+		parameter.push ({name: "id_metaconsole", value: values['server_id']});
 	}
 	parameter.push ({name: "period", value: values['event_max_time_row']});
 	parameter.push ({name: "id_visual_console", value: id_visual_console});
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index db155e6f61..2af9bf6d9e 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -328,8 +328,19 @@ switch ($action) {
 	
 	
 	case 'get_layout_data':
+		if(is_metaconsole()){
+			$server_data = metaconsole_get_connection_by_id($server_id);
+			// Establishes connection
+			if (metaconsole_load_external_db($server_data) !== NOERR) continue;
+		}
+
 		$layoutData = db_get_row_filter('tlayout_data',
 			array('id' => $id_element));
+
+		if(is_metaconsole()){
+			metaconsole_restore_db();
+		}
+
 		$layoutData['height'] = $layoutData['height'];
 		$layoutData['width']  = $layoutData['width'];
 		echo json_encode($layoutData);
@@ -726,6 +737,14 @@ switch ($action) {
 						if ($id_custom_graph !== null) {
 							$values['id_custom_graph'] = $id_custom_graph;
 						}
+
+						if(is_metaconsole()){
+							if($values['id_custom_graph'] != 0){
+								$explode_id = explode("|", $values['id_custom_graph']);
+								$values['id_custom_graph'] = $explode_id[0];
+								$values['id_metaconsole'] = $explode_id[1];
+							}
+						}
 						break;
 					case 'bars_graph':
 						if ($width_percentile !== null) {
@@ -1208,9 +1227,11 @@ switch ($action) {
 				$values['type'] = MODULE_GRAPH;
 
 				if(is_metaconsole()){
-					$explode_id = explode("|", $values['id_custom_graph']);
-					$values['id_custom_graph'] = $explode_id[0];
-					$values['id_metaconsole']  = $explode_id[1];
+					if($values['id_custom_graph'] != 0){
+						$explode_id = explode("|", $values['id_custom_graph']);
+						$values['id_custom_graph'] = $explode_id[0];
+						$values['id_metaconsole'] = $explode_id[1];
+					}
 				}
 
 				if ($values['id_custom_graph'] > 0 ) {