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

2010-07-13 Sergio Martin <sergio.martin@artica.es> 

* include/functions_visual_map.php
	godmode/reporting/visual_console_builder.editor.php: Fixed the
	visualmaps for ignore the disabled and delete pending modules
	for bug: 3022892



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2998 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-07-13 09:25:21 +00:00
parent b7c444ab89
commit 5bd833ccc9
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2010-07-13 Sergio Martin <sergio.martin@artica.es>
* include/functions_visual_map.php
godmode/reporting/visual_console_builder.editor.php: Fixed the
visualmaps for ignore the disabled and delete pending modules
for bug: 3022892
2010-07-13 Darío Rodríguez <dario.rodriguez@artica.es>
* general/pandora_help.php: Delete interrogation picture to get a

8
pandora_console/godmode/reporting/visual_console_builder.editor.php
View File

@ -221,6 +221,14 @@ echo '<div id="background" class="ui-widget-content" style="background: url(imag
border: 2px black solid; width: ' . $widthBackground . 'px; height: ' . $heightBackground . 'px;">';
foreach ($layoutDatas as $layoutData) {
// Pending delete and disable modules must be ignored
$delete_pending_module = get_db_value ("delete_pending", "tagente_modulo", "id_agente_modulo", $layoutData["id_agente_modulo"]);
$disabled_module = get_db_value ("disabled", "tagente_modulo", "id_agente_modulo", $layoutData["id_agente_modulo"]);
if($delete_pending_module == 1 || $disabled_module == 1)
continue;
printItemInVisualConsole($layoutData);
}

9
pandora_console/include/functions_visual_map.php
View File

@ -367,7 +367,14 @@ function print_pandora_visual_map ($id_layout, $show_links = true, $draw_lines =
// ****************************************************************
// Get parent status (Could be an agent, module, map, others doesnt have parent info)
// ****************************************************************
// Pending delete and disable modules must be ignored
$delete_pending_module = get_db_value ("delete_pending", "tagente_modulo", "id_agente_modulo", $layout_data["id_agente_modulo"]);
$disabled_module = get_db_value ("disabled", "tagente_modulo", "id_agente_modulo", $layout_data["id_agente_modulo"]);
if($delete_pending_module == 1 || $disabled_module == 1)
continue;
if ($layout_data["parent_item"] != 0){
$id_agent_module_parent = get_db_value ("id_agente_modulo", "tlayout_data", "id", $layout_data["parent_item"]);
$id_agent_parent = get_db_value ("id_agent", "tlayout_data", "id", $layout_data["parent_item"]);