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

2014-01-27 Sergio Martin <sergio.martin@artica.es 

* godmode/agentes/module_manager.php
	godmode/agentes/module_manager_editor_common.php: Help tip added
	near interval info of the data policy modules interval on module
	list and form. This tip war about that this interal only will be
	updated on policy application. Incident #379




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9377 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2014-01-27 16:45:33 +00:00
parent 3edba98c42
commit a1ac26011a
3 changed files with 17 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 @@
2014-01-27 Sergio Martin <sergio.martin@artica.es
* godmode/agentes/module_manager.php
godmode/agentes/module_manager_editor_common.php: Help tip added
near interval info of the data policy modules interval on module
list and form. This tip war about that this interal only will be
updated on policy application. Incident #379
2014-01-27 Sergio Martin <sergio.martin@artica.es> 2014-01-27 Sergio Martin <sergio.martin@artica.es>
* include/functions_events.php: Fixed metaconsole event * include/functions_events.php: Fixed metaconsole event

7
pandora_console/godmode/agentes/module_manager.php
View File

@ -414,7 +414,8 @@ $params = implode(',',
'str_critical', 'str_critical',
'quiet', 'quiet',
'critical_inverse', 'critical_inverse',
'warning_inverse')); 'warning_inverse',
'id_policy_module'));
$where = sprintf("delete_pending = 0 AND id_agente = %s", $id_agente); $where = sprintf("delete_pending = 0 AND id_agente = %s", $id_agente);
@ -645,6 +646,10 @@ foreach ($modules as $module) {
$data[4] = human_time_description_raw($agent_interval); $data[4] = human_time_description_raw($agent_interval);
} }
if ($module['id_modulo'] == MODULE_DATA && $module['id_policy_module'] != 0) {
$data[4] .= ui_print_help_tip(__('The policy modules of data type will only update their intervals when policy is applied.'), true);
}
$data[5] = ui_print_truncate_text($module['descripcion'], 'description', false); $data[5] = ui_print_truncate_text($module['descripcion'], 'description', false);
$data[6] = ui_print_status_image($status, $title, true); $data[6] = ui_print_status_image($status, $title, true);

3
pandora_console/godmode/agentes/module_manager_editor_common.php
View File

@ -321,6 +321,9 @@ if ($moduletype == MODULE_DATA) {
$table_advanced->data[2][1] = sprintf(__('Default') . ': 1' , $interval_factor) . ui_print_help_icon ('module_interval_factor', true); $table_advanced->data[2][1] = sprintf(__('Default') . ': 1' , $interval_factor) . ui_print_help_icon ('module_interval_factor', true);
$table_advanced->data[2][1] .= html_print_input_hidden('module_interval', $interval_factor, true); $table_advanced->data[2][1] .= html_print_input_hidden('module_interval', $interval_factor, true);
} }
else if ($module['id_policy_module'] != 0) {
$table_advanced->data[2][1] .= ui_print_help_tip(__('The policy modules of data type will only update their intervals when policy is applied.'), true);
}
// If it is a non policy form, the module_interval will not provided and will // If it is a non policy form, the module_interval will not provided and will
// be taken the agent interval (this code is at configurar_agente.php) // be taken the agent interval (this code is at configurar_agente.php)