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

2010-04-29 Sergio Martin <sergio.martin@artica.es> 

* include/functions_visual_map.php: Fixed the critical render
	from an object that was not static graph when was heredated
	from another layout. Bug 2940950



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2635 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-04-29 10:46:16 +00:00
parent b0425f2b3b
commit 58e9878348
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2010-04-29 Sergio Martin <sergio.martin@artica.es>
* include/functions_visual_map.php: Fixed the critical render
from an object that was not static graph when was heredated
from another layout. Bug 2940950
2010-04-29 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor_prediction.php:

9
pandora_console/include/functions_visual_map.php
View File

@ -330,11 +330,6 @@ function print_pandora_visual_map ($id_layout, $show_links = true, $draw_lines =
global $config;
$layout = get_db_row ('tlayout', 'id', $id_layout);
if(($layout["width"] == 0)){
print_error_message (__('The map has not elements'));
$layout["width"] = 1;
}
$resizedMap = false;
$proportion = 1;
if (!is_null($width)) {
@ -739,12 +734,12 @@ function get_layout_status ($id_layout = 0, $depth = 0) {
$sql = sprintf ('SELECT id_agente_modulo, parent_item, id_layout_linked, id_agent
FROM `tlayout_data` WHERE `id_layout` = %d', $id_layout);
$result = get_db_all_rows_filter ('tlayout_data', array ('id_layout' => $id_layout),
array ('id_agente_modulo', 'parent_item', 'id_layout_linked', 'id_agent'));
array ('id_agente_modulo', 'parent_item', 'id_layout_linked', 'id_agent', 'type'));
if ($result === false)
return 0;
foreach ($result as $rownum => $data) {
if ($data["id_layout_linked"] == 0 && $data["id_agente_modulo"] == 0 && $data["id_agent"] == 0)
if (($data["id_layout_linked"] == 0 && $data["id_agente_modulo"] == 0 && $data["id_agent"] == 0) || $data['type'] != 0)
continue;
// Other Layout (Recursive!)
if (($data["id_layout_linked"] != 0) && ($data["id_agente_modulo"] == 0)) {