tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs in alert actions

Browse Source
This commit is contained in:
manuel 2019-12-05 16:43:26 +01:00
parent 0263060639
commit 85f4301e4c
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pandora_console/godmode/alerts/configure_alert_action.php
View File

@ -140,14 +140,8 @@ $table->colspan[0][1] = 2;
$table->data[1][0] = __('Group'); $table->data[1][0] = __('Group');
$own_info = get_user_info($config['id_user']); $own_info = get_user_info($config['id_user']);
// Only display group "All" if user is administrator or has "PM" privileges
if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
$display_all_group = true;
} else {
$display_all_group = false;
}
$table->data[1][1] = html_print_select_groups(false, 'LW', $display_all_group, 'group', $group, '', '', 0, true); $table->data[1][1] = html_print_select_groups(false, 'LW', true, 'group', $group, '', '', 0, true);
$table->colspan[1][1] = 2; $table->colspan[1][1] = 2;
$table->data[2][0] = __('Command'); $table->data[2][0] = __('Command');
@ -173,9 +167,9 @@ $table->data[2][1] = html_print_select_from_sql(
); );
$table->data[2][1] .= ' '; $table->data[2][1] .= ' ';
if (check_acl($config['id_user'], 0, 'PM')) { if (check_acl($config['id_user'], 0, 'PM')) {
$table->data[2][1] .= html_print_image('images/add.png', true);
$table->data[2][1] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_command&pure='.$pure.'">';
$table->data[2][1] .= __('Create Command'); $table->data[2][1] .= __('Create Command');
$table->data[2][1] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_command&pure='.$pure.'">';
$table->data[2][1] .= html_print_image('images/add.png', true);
$table->data[2][1] .= '</a>'; $table->data[2][1] .= '</a>';
} }
@ -320,18 +314,18 @@ $(document).ready (function () {
original_command = data["command"]; original_command = data["command"];
render_command_preview (original_command); render_command_preview (original_command);
command_description = data["description"]; command_description = data["description"];
if (command_description != undefined) {
render_command_description(command_description); render_command_description(command_description);
} else {
render_command_description('');
}
var max_fields = parseInt('<?php echo $config['max_macro_fields']; ?>'); var max_fields = parseInt('<?php echo $config['max_macro_fields']; ?>');
// Change the selected group // Change the selected group
$("#group option").each(function(index, value) { $("#group option").each(function(index, value) {
var current_group = $(value).val(); var current_group = $(value).val();
if (data.id_group != 0 && current_group != 0 && current_group != data.id_group) {
$(value).hide();
} else {
$(value).show();
}
}); });
if (data.id_group != 0 && $("#group").val() != data.id_group) { if (data.id_group != 0 && $("#group").val() != data.id_group) {
$("#group").val(0); $("#group").val(0);