From a1ac26011aba16e414166b17f3c2a9d2eb5408e8 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Mon, 27 Jan 2014 16:45:33 +0000 Subject: [PATCH] 2014-01-27 Sergio Martin * include/functions_events.php: Fixed metaconsole event diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 21722a8e75..93d8a2105c 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -414,7 +414,8 @@ $params = implode(',', 'str_critical', 'quiet', 'critical_inverse', - 'warning_inverse')); + 'warning_inverse', + 'id_policy_module')); $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); } + 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[6] = ui_print_status_image($status, $title, true); diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 7e2f91bc49..14be1cc4c9 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -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] .= 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 // be taken the agent interval (this code is at configurar_agente.php)