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

2009-10-30 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_api.php: fix the tiny bug that not set the default
	separator in function "get_tree_agents".
	* godmode/reporting/reporting_builder.php: fix the bug that don't change the
	select box of module.
	Fixes: 2888988



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2066 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2009-10-30 12:51:47 +00:00
parent f6f47894ed
commit 9e975b8a61
3 changed files with 16 additions and 3 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 @@
2009-10-30 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fix the tiny bug that not set the default
separator in function "get_tree_agents".
* godmode/reporting/reporting_builder.php: fix the bug that don't change the
select box of module.
Fixes: 2888988
2009-10-30 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/control, DEBIAN/md5sums, DEBIAN/postinst, DEBIAN/prerm,

4
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -263,7 +263,9 @@ if ($edit_sla_report_content) {
$table->head = array ();
$table->style[0] = 'font-weight: bold';
$table->data[0][0] = __('Agent');
$table->data[0][1] = print_select ($agents, 'id_agent', 0, '', '--', 0, true);
$table->data[0][1] = print_input_text_extended ('id_agent', __('Select'), 'text_id_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>';
$table->data[1][0] = __('Module');
$table->data[1][1] = print_select (array (), 'id_module', 0, '', '--', 0, true);
$table->data[2][0] = __('SLA Min. (value)');

7
pandora_console/include/functions_api.php
View File

@ -224,7 +224,7 @@ function get_module_last_value($idAgentModule, $trash1, $other = ';', $returnTyp
* @return unknown_type
*/
function get_tree_agents($trash1, $trahs2, $other, $returnType)
{
{
if ($other['type'] == 'array') {
$separator = $other['data'][0];
$returnReplace = $other['data'][1];
@ -238,7 +238,10 @@ function get_tree_agents($trash1, $trahs2, $other, $returnType)
}
else {
$separator = $other['data'];
if (strlen($other['data']) == 0)
$separator = ';'; //by default
else
$separator = $other['data'];
$returnReplace = ' ';
$fields = false;
}