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

New networkmaps in progress... (Fixed refresh holding area action in js)

This commit is contained in:
Arturo Gonzalez 2016-09-20 10:40:23 +02:00
parent 038470793d
commit 249f81da7e
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_pandora_networkmap.php
View File

@ -2567,6 +2567,8 @@ function networkmap_refresh_holding_area($id_networkmap) {
array('state' => $row['state']),
array('id' => $row['id']));
$row['style'] = json_decode($row['style'], true);
$node = networkmap_db_node_to_js_node($row, $count,
$count_item_holding_area);

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

@ -934,7 +934,6 @@ function zoom(manual) {
function set_positions_graph() {
link.selectAll("path.link")
.attr("d", function(d) {
@ -949,8 +948,6 @@ function set_positions_graph() {
" L " + d.source.x + " " + d.source.y;
});
node.selectAll(".node_shape_circle")
.attr("cx", function(d) {
return d.x;
@ -1624,41 +1621,42 @@ function init_drag_and_drop() {
if (d3.event.sourceEvent.button == 2)
return;
flag_drag_running = false;
var selection = d3.selectAll('.node_selected');
selection
.each(function(d) {
var params = [];
params.push("update_node=1");
params.push("node=" + JSON.stringify(d));
params.push("page=operation/agentes/pandora_networkmap.view");
jQuery.ajax ({
data: params.join ("&"),
dataType: 'json',
type: 'POST',
url: action="ajax.php",
success: function (data) {
if (d.state == 'holding_area') {
//It is out the holding area
if (data['state'] == "") {
//Remove the style of nodes and links
//in holding area
d3.select("#id_node_" + d.id)
.classed("holding_area", false);
d3.select(".source_" + d.id)
.classed("holding_area_link", false);
d3.select(".target_" + d.id)
.classed("holding_area_link", false);
if (enterprise_installed) {
selection
.each(function(d) {
var params = [];
params.push("update_node=1");
params.push("node=" + JSON.stringify(d));
params.push("page=operation/agentes/pandora_networkmap.view");
jQuery.ajax ({
data: params.join ("&"),
dataType: 'json',
type: 'POST',
url: action="ajax.php",
success: function (data) {
if (d.state == 'holding_area') {
//It is out the holding area
if (data['state'] == "") {
//Remove the style of nodes and links
//in holding area
d3.select("#id_node_" + d.id)
.classed("holding_area", false);
d3.select(".source_" + d.id)
.classed("holding_area_link", false);
d3.select(".target_" + d.id)
.classed("holding_area_link", false);
}
}
}
}
});
});
});
}
d3.event.sourceEvent.stopPropagation();
})