From f880d9202afe2f825e269ce357f83d05e95e72f3 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Tue, 26 Mar 2019 15:27:45 +0100 Subject: [PATCH] Adde no popup configuration token to avoid to show tooltips Former-commit-id: d5b6260a065b40dfbc498db077a610c35a9e0fb3 --- .../include/class/NetworkMap.class.php | 19 +++++++++++++++++-- pandora_console/include/functions_network.php | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php index db8df9e2a1..56ef4ce0f5 100644 --- a/pandora_console/include/class/NetworkMap.class.php +++ b/pandora_console/include/class/NetworkMap.class.php @@ -282,6 +282,13 @@ class NetworkMap */ private $filter; + /** + * Do not show the popup window. + * + * @var integer + */ + private $noPopUp; + /** * Base constructor. @@ -369,6 +376,10 @@ class NetworkMap $this->noPandoraNode = $options['no_pandora_node']; } + if (isset($options['no_popup'])) { + $this->noPopUp = $options['no_popup']; + } + // Use a custom parser. if (isset($options['custom_parser'])) { $this->customParser = $options['custom_parser']; @@ -3390,13 +3401,17 @@ class NetworkMap $output .= $this->loadMapSkel(); $output .= $this->loadMapData(); $output .= $this->loadController(); - $output .= $this->loadAdvancedInterface(); + if (!$this->noPopUp) { + $output .= $this->loadAdvancedInterface(); + } } else { // Simulated, no tmap entries. $output .= $this->loadMapSkel(); $output .= $this->loadMapData(); $output .= $this->loadController(); - $output .= $this->loadSimpleInterface(); + if (!$this->noPopUp) { + $output .= $this->loadSimpleInterface(); + } } $output .= ' diff --git a/pandora_console/include/functions_network.php b/pandora_console/include/functions_network.php index e25c86a23d..9c9e1456b4 100644 --- a/pandora_console/include/functions_network.php +++ b/pandora_console/include/functions_network.php @@ -262,6 +262,7 @@ function network_general_map_configuration($nodes, $relations) 'relations' => $relations, 'pure' => 1, 'no_pandora_node' => 1, + 'no_popup' => 1, 'map_options' => [ 'generation_method' => LAYOUT_SPRING1, 'map_filter' => [