mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-31 01:35:36 +02:00
Merge branch 'ent-7306-ventana-modal-con-errores-visuales-en-alerts-command' into 'develop'
minnor error fixed See merge request artica/pandorafms!4032
This commit is contained in:
commit
a2f5fd4325
@ -462,13 +462,16 @@ if (is_ajax()) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// This check should be after ajax. Because, ajax will be called from configure_alert_action.
|
// This check should be after ajax. Because, ajax will be called from configure_alert_action.
|
||||||
if (!check_acl($config['id_user'], 0, 'PM') && !is_user_admin($config['id_user
|
if (!check_acl($config['id_user'], 0, 'PM') && !is_user_admin(
|
||||||
'])) {
|
$config['id_user
|
||||||
|
']
|
||||||
|
)
|
||||||
|
) {
|
||||||
echo "<div id='message_permissions' title='".__('Permissions warning')."' s
|
echo "<div id='message_permissions' title='".__('Permissions warning')."' s
|
||||||
tyle='display:none;'>";
|
tyle='display:none;'>";
|
||||||
echo "<p style='text-align: center;font-weight: bold;'>".__('Command managem
|
echo "<p style='text-align: center;font-weight: bold; margin: 15px'>".__(
|
||||||
ent is limited to administrator users or user profiles with permissions over Pan
|
'Command management is limited to administrator users or user profiles with permissions PM'
|
||||||
dora FMS management').'</p>';
|
).'</p>';
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -680,12 +683,19 @@ foreach ($commands as $command) {
|
|||||||
|
|
||||||
// (IMPORTANT, DO NOT CHANGE!) only users with permissions over "All" group have access to edition of commands belonging to "All" group.
|
// (IMPORTANT, DO NOT CHANGE!) only users with permissions over "All" group have access to edition of commands belonging to "All" group.
|
||||||
if ($is_central_policies_on_node === false && !$command['internal'] && check_acl_restricted_all($config['id_user'], $command['id_group'], 'LM')) {
|
if ($is_central_policies_on_node === false && !$command['internal'] && check_acl_restricted_all($config['id_user'], $command['id_group'], 'LM')) {
|
||||||
$data['action'] = '<span class="inline_flex">';
|
if (check_acl($config['id_user'], 0, 'PM') || is_user_admin(
|
||||||
$data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&copy_command=1&id='.$command['id'].'&pure='.$pure.'"
|
$config['id_user
|
||||||
onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/copy.png', true, ['class' => 'invert_filter']).'</a>';
|
']
|
||||||
$data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&delete_command=1&id='.$command['id'].'&pure='.$pure.'"
|
)
|
||||||
|
) {
|
||||||
|
$data['action'] = '<span class="inline_flex">';
|
||||||
|
$data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&copy_command=1&id='.$command['id'].'&pure='.$pure.'"
|
||||||
|
onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/copy.png', true, ['class' => 'invert_filter']).'</a>';
|
||||||
|
|
||||||
|
$data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&delete_command=1&id='.$command['id'].'&pure='.$pure.'"
|
||||||
onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>';
|
onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>';
|
||||||
$data['action'] .= '</span>';
|
$data['action'] .= '</span>';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
array_push($table->data, $data);
|
array_push($table->data, $data);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user