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

2009-08-24 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/reporting/map_builder.php,
	pandora_console/include/functions_visual_map.php: Fixed bug in visual map,
	in edit and view, this bug relate with add agent graphic element without
	module defined.
	


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1874 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2009-08-24 09:08:24 +00:00
parent e8506e8c81
commit 75a7df72a8
3 changed files with 15 additions and 3 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 @@
2009-08-24 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/map_builder.php,
pandora_console/include/functions_visual_map.php: Fixed bug in visual map,
in edit and view, this bug relate with add agent graphic element without
module defined.
2009-08-20 Sancho Lerena <slerena@artica.es>
* godmode/agentes/configurar_agente.php: Fixed bug with agent address

10
pandora_console/godmode/reporting/map_builder.php
View File

@ -160,6 +160,11 @@ if ($get_layout_data) {
$layout_data['id_agent'] = give_agent_id_from_module_id ($layout_data['id_agente_modulo']);
$layout_data['name_agent'] = get_agent_name ($layout_data['id_agent'], 'none');
}
else {
if ($layout_data['id_agent']) {
$layout_data['name_agent'] = get_agent_name ($layout_data['id_agent'], 'none');
}
}
if (is_ajax ()) {
echo json_encode ($layout_data);
@ -441,11 +446,10 @@ if (! $edit_layout && ! $id_layout) {
$table->data[3][1] = print_input_text ('height', '', '', 5, 5, true);
$table->data[4][0] = __('Width');
$table->data[4][1] = print_input_text ('width', '', '', 5, 5, true);
$table->data[5][0] = __('Agent');
$table->data[5][0] = __('Agent') . '<a href="#" class="tip">&nbsp;<span>' . __("Type two chars at least for search") . '</span></a>';
// $table->data[5][1] = print_select ($agents, 'agent', '', '', '--', 0, true);
$table->data[5][1] = print_input_text_extended ('agent', '', 'text-agent', '', 30, 100, false, '',
array('style' => 'background: url(images/lightning.png) no-repeat right;'), true)
. '<a href="#" class="tip">&nbsp;<span>' . __("Type two chars at least for search") . '</span></a>';
array('style' => 'background: url(images/lightning.png) no-repeat right;'), true);
$table->data[6][0] = __('Module');
$table->data[6][1] = print_select (array (), 'module', '', '', '--', 0, true);
$table->data[7][0] = __('Period');

1
pandora_console/include/functions_visual_map.php
View File

@ -74,6 +74,7 @@ function print_pandora_visual_map ($id_layout, $show_links = true, $draw_lines =
} elseif ($layout_data['id_agent'] != 0) {
$status = get_agent_status ($layout_data["id_agent"]);
$status_parent = $status;
$id_agent = $layout_data["id_agent"];
} else {
$status = 3;
$status_parent = 3;