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

2012-08-09 Sergio Martin <sergio.martin@artica.es> 

* include/functions_modules.php
	include/functions_groups.php
	include/javascript/pandora.js: Fix minor issues
	in the select for time advanced control. Improve some
	functions to use from metaconsole



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6852 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-08-09 11:45:33 +00:00
parent c6bfef6885
commit b9fa8a5a49
4 changed files with 16 additions and 1 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 @@
2012-08-09 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php
include/functions_groups.php
include/javascript/pandora.js: Fix minor issues
in the select for time advanced control. Improve some
functions to use from metaconsole
2012-08-09 Vanessa Gil <vanessa.gil@artica.es>
* godmode/reporting/reporting_builer.list_items.php

2
pandora_console/include/functions_groups.php
View File

@ -470,7 +470,7 @@ function groups_get_groups_tree_recursive($groups, $parent = 0, $deep = 0) {
$return = array();
foreach ($groups as $key => $group) {
if (($key == 0) && ($parent == 0)) { //When the groups is the all group
if (($key === 0 || $key === __('All')) && ($parent === 0 || $parent === __('All'))) { //When the groups is the all group
$group['deep'] = $deep;
$group['hash_branch'] = true;
$deep ++;

3
pandora_console/include/functions_modules.php
View File

@ -686,6 +686,9 @@ function modules_get_agentmodule_kind($id_agentmodule) {
case 6:
return 'wmiserver';
break;
case 7:
return 'webserver';
break;
default:
return 'other';
break;

4
pandora_console/include/javascript/pandora.js
View File

@ -662,6 +662,8 @@ function period_select_init(name) {
// If the text input is empty, we put on it 5 minutes by default
if($('#text-'+name+'_text').val() == '') {
$('#text-'+name+'_text').val(300);
// Set the value in the hidden field too
$('.'+name).val(300);
if($('#'+name+'_select option:eq(0)').val() == 0) {
$('#'+name+'_select option:eq(2)').attr('selected', 'selected');
}
@ -671,6 +673,8 @@ function period_select_init(name) {
}
else if($('#text-'+name+'_text').val() == 0) {
$('#'+name+'_units option:last').removeAttr('selected');
$('#'+name+'_manual').show();
$('#'+name+'_default').hide();
}
}