From 7f6ec7a5016307af5f36fc6609de36cb28321835 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Mon, 29 Apr 2019 11:03:56 +0200 Subject: [PATCH] Visual Console Refactor: bugfix Former-commit-id: 10f2a2199275475b7674364bb5f3d595b65f12c9 --- pandora_console/include/javascript/pandora_visual_console.js | 2 +- pandora_console/operation/visual_console/public_view.php | 2 +- pandora_console/operation/visual_console/view.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/javascript/pandora_visual_console.js b/pandora_console/include/javascript/pandora_visual_console.js index cd21dd77d0..1df990db10 100755 --- a/pandora_console/include/javascript/pandora_visual_console.js +++ b/pandora_console/include/javascript/pandora_visual_console.js @@ -98,7 +98,7 @@ function createVisualConsole( e.data.linkedLayoutId > 0 && e.data.link != null && e.data.link.length > 0 && - (e.data.metaconsoleId == null || e.data.metaconsoleId === 0) + (e.data.linkedLayoutAgentId == null || e.data.linkedLayoutAgentId === 0) ) { // Stop the current link behavior. e.nativeEvent.preventDefault(); diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php index dce6cb4bdb..ed79f9a59e 100644 --- a/pandora_console/operation/visual_console/public_view.php +++ b/pandora_console/operation/visual_console/public_view.php @@ -159,7 +159,7 @@ $visualConsoleItems = VisualConsole::getItemsFromDB( // Change the links. if (prevProps && prevProps.id !== newProps.id) { - var regex = /(id=|id_visual_console=|id_layout=)\d+(&?)/gi; + var regex = /(id=|id_visual_console=|id_layout=|id_visualmap=)\d+(&?)/gi; var replacement = '$1' + newProps.id + '$2'; // Tab links. diff --git a/pandora_console/operation/visual_console/view.php b/pandora_console/operation/visual_console/view.php index 4baa52e948..3192396336 100644 --- a/pandora_console/operation/visual_console/view.php +++ b/pandora_console/operation/visual_console/view.php @@ -261,7 +261,7 @@ $visualConsoleItems = VisualConsole::getItemsFromDB( // Change the links. if (prevProps && prevProps.id !== newProps.id) { - var regex = /(id=|id_visual_console=|id_layout=)\d+(&?)/gi; + var regex = /(id=|id_visual_console=|id_layout=|id_visualmap=)\d+(&?)/gi; var replacement = '$1' + newProps.id + '$2'; // Tab links.