tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adde no popup configuration token to avoid to show tooltips 

Former-commit-id: d5b6260a065b40dfbc498db077a610c35a9e0fb3
This commit is contained in:
fermin831 2019-03-26 15:27:45 +01:00
parent f2e710907a
commit f880d9202a
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pandora_console/include/class/NetworkMap.class.php
View File

@ -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 .= '

1
pandora_console/include/functions_network.php
View File

@ -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' => [