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

2010-10-19 Sergio Martin <sergio.martin@artica.es> 

* include/functions_visual_map.php
	include/ajax/visual_console_builder.ajax.php
	godmode/reporting/visual_console_builder.php: Added the html support
	in the label type items of the visual consoles for pending
	task 3063404



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3425 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-10-19 15:57:07 +00:00
parent 7c3ed62967
commit 4780638b9e
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2010-10-19 Sergio Martin <sergio.martin@artica.es>
* include/functions_visual_map.php
include/ajax/visual_console_builder.ajax.php
godmode/reporting/visual_console_builder.php: Added the html support
in the label type items of the visual consoles for pending
task 3063404
2010-10-19 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php: added hook for "user translation" in function

1
pandora_console/godmode/reporting/visual_console_builder.php
View File

@ -117,7 +117,6 @@ switch ($activeTab) {
foreach ($idsElements as $idElement) {
$id = $idElement['id'];
$values = array();
//$values['label'] = get_parameter('label_' . $id, '');
$values['label'] = get_parameter('label_' . $id, '');
$values['image'] = get_parameter('image_' . $id, '');
$values['width'] = get_parameter('width_' . $id, 0);

1
pandora_console/include/ajax/visual_console_builder.ajax.php
View File

@ -200,6 +200,7 @@ switch ($action) {
$elementFields['height_module_graph'] = $elementFields['height'];
break;
}
$elementFields['label'] = safe_output($elementFields['label']);
echo json_encode($elementFields);
break;
}

4
pandora_console/include/functions_visual_map.php
View File

@ -406,7 +406,7 @@ function print_pandora_visual_map ($id_layout, $show_links = true, $draw_lines =
if ($layout_datas !== false) {
foreach ($layout_datas as $layout_data) {
$layout_data['label'] = safe_output($layout_data['label']);
// ****************************************************************
// Get parent status (Could be an agent, module, map, others doesnt have parent info)
// ****************************************************************
@ -878,8 +878,6 @@ function get_layout_status ($id_layout = 0, $depth = 0) {
$id_layout = (int) $id_layout;
$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', 'type'));
if ($result === false)