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 map id in node objects and the ntwmap popup path)

This commit is contained in:
Arturo Gonzalez 2016-09-16 13:56:51 +02:00
parent 7a513db06b
commit 040bfc5532
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/functions_pandora_networkmap.php
View File

@ -423,8 +423,8 @@ function networkmap_db_node_to_js_node($node, &$count, &$count_item_holding_area
}
$item['color'] = $color;
$item['map_id'] = 0;
if (isset($node['map_id'])) {
$item['map_id'] = $node['map_id'];
if (isset($node['id_map'])) {
$item['map_id'] = $node['id_map'];
}
$count++;
@ -1192,7 +1192,7 @@ function show_node_info($id_node, $refresh_state, $user_readonly) {
};";
}
echo "var color_status_node = '" . get_status_color_networkmap($row['id_agent']) . "';";
echo "var color_status_node = '" . get_status_color_networkmap($row['source_data']) . "';";
echo "</script>";
$mode_show = get_parameter('mode_show', 'all');
@ -1201,7 +1201,7 @@ function show_node_info($id_node, $refresh_state, $user_readonly) {
</script>";
echo '<div style="text-align: center;">';
echo '<b><a target="_blank" style="text-decoration: none;" href="' . $url_agent . '">' . agents_get_name($row['id_agent']) . '</a></b><br />';
echo '<b><a target="_blank" style="text-decoration: none;" href="' . $url_agent . '">' . agents_get_name($row['source_data']) . '</a></b><br />';
$modes_show = array('status_module' => 'Only status', 'all' => 'All');
echo __('Show modules:');
html_print_select($modes_show, 'modes_show', $mode_show, 'refresh_window();');
@ -1234,7 +1234,7 @@ function show_node_info($id_node, $refresh_state, $user_readonly) {
//Set the first size for the canvas
//$("#node_info").attr("height", $(window).height());
//$("#node_info").attr("width", $(window).width());
show_networkmap_node(' . $row['id_agent'] . ', ' . $refresh_state . ');
show_networkmap_node(' . $row['source_data'] . ', ' . $refresh_state . ');
});
</script>
</div>

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

@ -765,8 +765,11 @@ function show_details_agent(d) {
//Fictional node without link
}
else {
url = url_popup;
url = url + "?refresh_state=" + refresh_period;
url = "index.php?" +
"sec=network&" +
"sec2=operation/agentes/pandora_networkmap&" +
"tab=popup&";
url = url + "refresh_state=" + refresh_period;
url = url + "&id=" + d.id_db;