From 0b134f827cc2469a40efc0df474daba53aa5ff3b Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Fri, 1 Jun 2012 07:49:08 +0000 Subject: [PATCH] 2012-06-01 Sergio Martin * godmode/massive/massive_edit_modules.php: Added units to module massive editor and missed help bubble in the same editor to post process field Merged from 4.0.x git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6397 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/godmode/massive/massive_edit_modules.php | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 28edd98d17..a57aa16163 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2012-06-01 Sergio Martin + + * godmode/massive/massive_edit_modules.php: Added units to + module massive editor and missed help bubble in the same + editor to post process field + Merged from 4.0.x + 2012-05-31 Miguel de Dios * mobile/include/user.class.php: added option to get from url a diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php index 0c8ca2909d..d9013589c8 100644 --- a/pandora_console/godmode/massive/massive_edit_modules.php +++ b/pandora_console/godmode/massive/massive_edit_modules.php @@ -36,7 +36,7 @@ function process_manage_edit ($module_name, $agents_select = null) { /* List of fields which can be updated */ $fields = array ('min_warning', 'max_warning', 'str_warning', 'min_critical', 'max_critical', 'str_critical', 'min_ff_event', 'module_interval', - 'disabled', 'post_process', 'snmp_community', 'tcp_send', 'custom_string_1', 'plugin_parameter', + 'disabled', 'post_process', 'unit', 'snmp_community', 'tcp_send', 'custom_string_1', 'plugin_parameter', 'custom_string_2', 'custom_string_3', 'min', 'max', 'id_module_group', 'plugin_user', 'plugin_pass', 'id_export', 'history_data'); $values = array (); @@ -359,7 +359,7 @@ $table->data['edit2'][1] = html_print_extended_select_for_time ('module_interval $table->data['edit2'][2] = __('Disabled'); $table->data['edit2'][3] = html_print_select(array('' => __('No change'), '1' => __('Yes'), '0' => __('No')),'disabled','','','', '', true); -$table->data['edit3'][0] = __('Post process'); +$table->data['edit3'][0] = __('Post process').ui_print_help_icon ('postprocess', true); $table->data['edit3'][1] = html_print_input_text ('post_process', '', '', 10, 15, true); $table->data['edit3'][2] = __('SMNP community'); $table->data['edit3'][3] = html_print_input_text ('snmp_community', '', '', 10, 15, true); @@ -401,6 +401,9 @@ $table->data['edit6'][0] = __('Export target'); $targets2 = db_get_all_rows_sql ("SELECT id, name FROM tserver_export ORDER by name"); $targets = array_merge(array(0 => __('None')), $targets2 ); $table->data['edit6'][1] = html_print_select ($targets, 'id_export', '','', __('No change'), '', true, false, false); +$table->data['edit6'][2] = __('Unit'); +$table->data['edit6'][3] = html_print_input_text ('unit', '', '', 15, 60, true); + /* FF stands for Flip-flop */ $table->data['edit7'][0] = __('FF threshold') . ' ' . ui_print_help_icon ('ff_threshold', true);