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

Merge branch '1368-Problems-with-empty-networkmaps-dev' into 'develop' 

Fixed id of pandora node

See merge request !873
This commit is contained in:
vgilc 2017-10-04 10:37:26 +02:00
parent 82f8b333d5 65bfedf404
commit 4cc3f0d426
2 changed files with 1471 additions and 1463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

791
pandora_console/include/javascript/functions_pandora_networkmap.js
View File

File diff suppressed because it is too large Load Diff

5
pandora_console/operation/agentes/pandora_networkmap.php
View File

@ -495,8 +495,13 @@ switch ($tab) {
$count = 0; $count = 0;
if (($count == 0) && ($network_map['source'] != 'empty')) { if (($count == 0) && ($network_map['source'] != 'empty')) {
if (enterprise_installed() && ($network_map['generated'])) {
$data['nodes'] = __('Empty map');
}
else {
$data['nodes'] = __('Pending to generate'); $data['nodes'] = __('Pending to generate');
} }
}
else { else {
$data['nodes'] = $count - 1; //PandoraFMS node is not an agent $data['nodes'] = $count - 1; //PandoraFMS node is not an agent
} }