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

Merge branch '1075-Operaciones-masivas-ponen-postprocess-a-0-dev' into 'develop' 

Fixed post process in Edit modules in bulk

See merge request !638
This commit is contained in:
vgilc 2017-07-07 09:38:48 +02:00
parent 3c2ef0ea2c cfc7050bab
commit e49c2351ae
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/godmode/massive/massive_edit_modules.php
View File

@ -496,7 +496,7 @@ $table->data['edit3'][0] = __('Post process') .
ui_print_help_icon ('postprocess', true); ui_print_help_icon ('postprocess', true);
$table->data['edit3'][1] = html_print_extended_select_for_post_process('post_process', $table->data['edit3'][1] = html_print_extended_select_for_post_process('post_process',
0, '', 0, '', false, true, 'width:150px;', true); -1, '','', 0, false, true, 'width:150px;', true, false, 1);
$table->data['edit3'][2] = __('SMNP community'); $table->data['edit3'][2] = __('SMNP community');
$table->data['edit3'][3] = html_print_input_text ('snmp_community', '', $table->data['edit3'][3] = html_print_input_text ('snmp_community', '',
@ -1153,6 +1153,11 @@ function process_manage_edit ($module_name, $agents_select = null) {
$values['plugin_pass'] = io_input_password($value); $values['plugin_pass'] = io_input_password($value);
} }
break; break;
case 'post_process':
if($value !== '-1'){
$values['post_process'] = $value;
}
break;
default: default:
if ($value != '') { if ($value != '') {
$values[$field] = $value; $values[$field] = $value;

6
pandora_console/include/functions_html.php
View File

@ -609,7 +609,7 @@ function html_print_select_from_sql ($sql, $name, $selected = '',
function html_print_extended_select_for_post_process($name, $selected = '', function html_print_extended_select_for_post_process($name, $selected = '',
$script = '', $nothing = '', $nothing_value = '0', $size = false, $script = '', $nothing = '', $nothing_value = '0', $size = false,
$return = false, $select_style = false, $unique_name = true, $return = false, $select_style = false, $unique_name = true,
$disabled = false) { $disabled = false, $no_change = 0) {
global $config; global $config;
@ -617,6 +617,10 @@ function html_print_extended_select_for_post_process($name, $selected = '',
$fields = post_process_get_custom_values(); $fields = post_process_get_custom_values();
if($no_change != 0){
$fields[-1] = __('No change');
}
$selected_float = (float)$selected; $selected_float = (float)$selected;
$found = false; $found = false;