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

Merge branch 'ent-6322-10688-edicion-usuarios-tecla-intro-borra-perfil' into 'develop'

Browse Source 
Avoid deleting profiles while pressing enter in user details (management)

See merge request artica/pandorafms!3456
This commit is contained in:
Daniel Rodriguez 2020-09-18 14:35:32 +02:00
commit d450213b95
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pandora_console/godmode/users/configure_user.php
View File

@ -1143,7 +1143,7 @@ if ($meta) {
$metaconsole_access_node .= html_print_checkbox('metaconsole_access_node', 1, $user_info['metaconsole_access_node'], true).'</div>'; $metaconsole_access_node .= html_print_checkbox('metaconsole_access_node', 1, $user_info['metaconsole_access_node'], true).'</div>';
} }
echo '<form id="user_profile_form" method="post" autocomplete="off">'; echo '<form id="user_profile_form" name="user_profile_form" method="post" autocomplete="off" action="#">';
if (!$id) { if (!$id) {
@ -1195,30 +1195,44 @@ if (!empty($ehorus)) {
echo '</div>'; echo '</div>';
profile_print_profile_table($id);
echo '<div style="width: 100%" class="action-buttons">'; echo '<div style="width: 100%" class="action-buttons">';
if ($config['admin_can_add_user']) { if ($config['admin_can_add_user']) {
html_print_csrf_hidden(); html_print_csrf_hidden();
if ($new_user) { if ($new_user) {
html_print_input_hidden('create_user', 1); html_print_input_hidden('create_user', 1);
html_print_submit_button(__('Create'), 'crtbutton', false, 'class="sub wand"');
} else { } else {
html_print_input_hidden('update_user', 1); html_print_input_hidden('update_user', 1);
html_print_submit_button(__('Update'), 'uptbutton', false, 'class="sub upd"');
} }
} }
echo '</div>';
html_print_input_hidden('json_profile', ''); html_print_input_hidden('json_profile', '');
echo '</div>';
echo '</form>'; echo '</form>';
profile_print_profile_table($id);
echo '<br />'; echo '<br />';
echo '<div style="width: 100%" class="action-buttons">';
if ($config['admin_can_add_user']) {
if ($new_user) {
html_print_submit_button(__('Create'), 'crtbutton', false, 'class="sub wand" form="user_profile_form"');
} else {
html_print_submit_button(__('Update'), 'uptbutton', false, 'class="sub upd" form="user_profile_form"');
}
}
echo '</div>';
echo '</div>';
enterprise_hook('close_meta_frame'); enterprise_hook('close_meta_frame');
$delete_image = html_print_input_image('del', 'images/cross.png', 1, '', true, ['onclick' => 'delete_profile(event, this)']); $delete_image = html_print_input_image('del', 'images/cross.png', 1, '', true, ['onclick' => 'delete_profile(event, this)']);
if (!is_metaconsole()) { if (!is_metaconsole()) {
?> ?>
@ -1335,7 +1349,7 @@ $(document).ready (function () {
e.preventDefault(); e.preventDefault();
var rows = $("#table_profiles tr").length; var rows = $("#table_profiles tr").length;
if (rows <= 3) { if (rows <= 3) {
if (!confirm('<?php echo __('Deleting last profile'); ?>' + '. ' + '<?php echo __('Are you sure?'); ?>')) { if (!confirm('<?php echo __('Deleting last profile will delete this user'); ?>' + '. ' + '<?php echo __('Are you sure?'); ?>')) {
return; return;
} }
} }

1
pandora_console/include/styles/pandora.css
View File

@ -4898,6 +4898,7 @@ input:checked + .p-slider:before {
.edit_user_labels { .edit_user_labels {
color: #343434; color: #343434;
text-align: left;
font-weight: bold; font-weight: bold;
padding-right: 10px; padding-right: 10px;
margin: 0px 0px 5px 0px; margin: 0px 0px 5px 0px;