tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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('state' => $row['state']),
array('id' => $row['id'])); array('id' => $row['id']));
$row['style'] = json_decode($row['style'], true);
$node = networkmap_db_node_to_js_node($row, $count, $node = networkmap_db_node_to_js_node($row, $count,
$count_item_holding_area); $count_item_holding_area);

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

@ -934,7 +934,6 @@ function zoom(manual) {
function set_positions_graph() { function set_positions_graph() {
link.selectAll("path.link") link.selectAll("path.link")
.attr("d", function(d) { .attr("d", function(d) {
@ -949,8 +948,6 @@ function set_positions_graph() {
" L " + d.source.x + " " + d.source.y; " L " + d.source.x + " " + d.source.y;
}); });
node.selectAll(".node_shape_circle") node.selectAll(".node_shape_circle")
.attr("cx", function(d) { .attr("cx", function(d) {
return d.x; return d.x;
@ -1624,11 +1621,11 @@ function init_drag_and_drop() {
if (d3.event.sourceEvent.button == 2) if (d3.event.sourceEvent.button == 2)
return; return;
flag_drag_running = false; flag_drag_running = false;
var selection = d3.selectAll('.node_selected'); var selection = d3.selectAll('.node_selected');
if (enterprise_installed) {
selection selection
.each(function(d) { .each(function(d) {
var params = []; var params = [];
@ -1659,6 +1656,7 @@ function init_drag_and_drop() {
} }
}); });
}); });
}
d3.event.sourceEvent.stopPropagation(); d3.event.sourceEvent.stopPropagation();
}) })