From 1dadd1fa18503a3f25698750ed53b0eb714b1af1 Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Tue, 18 Apr 2017 17:26:01 +0200
Subject: [PATCH] Fixed problems with rare names of agents in Visual console
 editor.

---
 .../reporting/visual_console_builder.editor.js       |  4 ++++
 .../reporting/visual_console_builder.elements.php    |  5 ++++-
 .../include/ajax/visual_console_builder.ajax.php     | 12 ++++++++++--
 .../include/functions_visual_map_editor.php          |  1 +
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index c338fb0d71..3820c825b3 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -270,6 +270,7 @@ function readFields() {
 	values['left'] = $("input[name=left]").val();
 	values['top'] = $("input[name=top]").val();
 	values['agent'] = $("input[name=agent]").val();
+	values['id_agent'] = $("input[name=id_agent]").val();
 	values['module'] = $("select[name=module]").val();
 	values['process_simple_value'] = $("select[name=process_value]").val();
 	values['background'] = $("#background_image").val();
@@ -761,6 +762,9 @@ function loadFieldsFromDB(item) {
 					$("input[name=agent]").val(val);
 					//Reload no-sincrone the select of modules
 				}
+				if (key == 'id_agent') {
+					$("input[name=id_agent]").val(val);
+				}
 				if (key == 'modules_html') {
 					$("select[name=module]").empty().html(val);
 					$("select[name=module]").val(moduleId);
diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php
index cc92ded1a4..96980dde65 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.elements.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php
@@ -354,7 +354,7 @@ foreach ($layoutDatas as $layoutData) {
 				$params['input_name'] = 'agent_' . $idLayoutData;
 				$params['javascript_is_function_select'] = true;
 				$params['selectbox_id'] = 'module_' . $idLayoutData;
-				if (defined('METACONSOLE')) {
+				if (is_metaconsole()) {
 					$params['javascript_ajax_page'] = '../../ajax.php';
 					$params['disabled_javascript_on_blur_function'] = true;
 					
@@ -370,6 +370,9 @@ foreach ($layoutDatas as $layoutData) {
 						"none", $layoutData['id_metaconsole'], true);
 				}
 				else {
+					$params['print_hidden_input_idagent'] = true;
+					$params['hidden_input_idagent_name'] = 'id_agent_' . $idLayoutData;
+					$params['hidden_input_idagent_value'] = $layoutData['id_agent'];
 					$params['value'] = agents_get_name($layoutData['id_agent']);
 				}
 				
diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php
index 639cb4f3a5..b06893cd36 100755
--- a/pandora_console/include/ajax/visual_console_builder.ajax.php
+++ b/pandora_console/include/ajax/visual_console_builder.ajax.php
@@ -472,6 +472,9 @@ switch ($action) {
 						$values['id_agent'] = $id_agent;
 					}
 				}
+				else if (!empty($id_agent)) {
+					$values['id_agent'] = $id_agent;
+				}
 				else if ($agent !== null) {
 					$id_agent = agents_get_agent_id($agent);
 					$values['id_agent'] = $id_agent;
@@ -769,10 +772,15 @@ switch ($action) {
 			$values['id_agent'] = $id_agent;
 		}
 		else {
-			if ($agent != '')
+			if (!empty($id_agent)) {
+				$values['id_agent'] = $id_agent;
+			}
+			else if (!empty($agent)) {
 				$values['id_agent'] = agents_get_agent_id($agent);
-			else
+			}
+			else {
 				$values['id_agent'] = 0;
+			}
 		}
 		$values['id_agente_modulo'] = $id_module;
 		$values['id_layout_linked'] = $map_linked;
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index b6feb53612..233ca99d02 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -264,6 +264,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
 			$params['javascript_is_function_select'] = true;
 			$params['use_hidden_input_idagent'] = true;
 			$params['print_hidden_input_idagent'] = true;
+			$params['hidden_input_idagent_name'] = 'id_agent';
 			if (defined('METACONSOLE')) {
 				$params['javascript_ajax_page'] = '../../ajax.php';
 				$params['disabled_javascript_on_blur_function'] = true;