tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixed id of pandora node

See merge request !873
This commit is contained in:
vgilc 2017-10-04 10:37:26 +02:00
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

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

@ -1119,7 +1119,7 @@ function delete_nodes() {
selection selection
.each(function (d) { .each(function (d) {
//Avoid to delete pandora node center //Avoid to delete pandora node center
if (d.id_agent == -1) { if (d.id_agent == 0) {
return; return;
} }
@ -1589,7 +1589,6 @@ function show_menu(item, data) {
name: interface_link_add, name: interface_link_add,
icon: "interface_link_children", icon: "interface_link_children",
disabled: function () { disabled: function () {
console.log(data);
if (enterprise_installed) { if (enterprise_installed) {
if (data.type == 3) { if (data.type == 3) {
return true; return true;
@ -3058,14 +3057,16 @@ function draw_elements_graph() {
} }
else { else {
return "85%"; return "85%";
}}) }
})
.attr("text-anchor", function (d) { .attr("text-anchor", function (d) {
if (d.source.x < d.target.x) { if (d.source.x < d.target.x) {
return ""; return "";
} }
else { else {
return "end"; return "end";
}}) }
})
.append("tspan") .append("tspan")
.attr("style", "font-size: 12px; " + .attr("style", "font-size: 12px; " +
"font-style:normal; " + "font-style:normal; " +
@ -3103,14 +3104,16 @@ function draw_elements_graph() {
} }
else { else {
return ""; return "";
}}) }
})
.attr("text-anchor", function (d) { .attr("text-anchor", function (d) {
if (d.source.x < d.target.x) { if (d.source.x < d.target.x) {
return "end"; return "end";
} }
else { else {
return ""; return "";
}}) }
})
.append("tspan") .append("tspan")
.attr("style", "font-size: 12px; " + .attr("style", "font-size: 12px; " +
"font-style:normal; " + "font-style:normal; " +

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
} }