gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace Change Password dialog to modal (#17116)

Browse Source 
* Replace Change Password dialog to modal

Signed-off-by: Saksham Gupta <shucontech@gmail.com>

* Bootstrap modal class

Signed-off-by: Saksham Gupta <shucontech@gmail.com>

* Fix failing tests

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Shucon Tech 2022-01-31 02:40:20 +05:30 committed by GitHub
parent 83bb5ff879
commit c3889257cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/src/functions.js
View File

@ -2762,11 +2762,7 @@ AJAX.registerOnload('functions.js', function () {
var $msgbox = Functions.ajaxShowMessage();
/**
* @var button_options Object containing options to be passed to jQueryUI's dialog
*/
var buttonOptions = {};
buttonOptions[Messages.strGo] = function () {
$('#changePasswordGoButton').on('click', function () {
event.preventDefault();
/**
@ -2801,11 +2797,9 @@ AJAX.registerOnload('functions.js', function () {
$('#edit_user_dialog').dialog('close').remove();
Functions.ajaxRemoveMessage($msgbox);
}); // end $.post()
};
$('#changePasswordModal').modal('hide');
});
buttonOptions[Messages.strCancel] = function () {
$(this).dialog('close');
};
$.get($(this).attr('href'), { 'ajax_request': true }, function (data) {
if (typeof data === 'undefined' || !data.success) {
Functions.ajaxShowMessage(data.error, false);
@ -2816,18 +2810,9 @@ AJAX.registerOnload('functions.js', function () {
AJAX.scriptHandler.load(data.scripts);
}
$('<div id="change_password_dialog"></div>')
.dialog({
title: Messages.strChangePassword,
width: 600,
close: function () {
$(this).remove();
},
buttons: buttonOptions,
modal: true
})
.append(data.message);
// for this dialog, we remove the fieldset wrapping due to double headings
$('#changePasswordModal').modal('show');
$('#changePasswordModal').find('.modal-body').first().html(data.message);
$('fieldset#fieldset_change_password')
.find('legend').remove().end()
.find('table.table').unwrap().addClass('m-3')

1
libraries/classes/Controllers/JavaScriptMessagesController.php
View File

@ -589,7 +589,6 @@ final class JavaScriptMessagesController
/* password generation */
'strGeneratePassword' => __('Generate password'),
'strGenerate' => __('Generate'),
'strChangePassword' => __('Change password'),
/* navigation tabs */
'strMore' => __('More'),

1
templates/header.twig
View File

@ -55,3 +55,4 @@
{{ include('modals/preview_sql_modal.twig') }}
{{ include('modals/enum_set_editor.twig') }}
{{ include('modals/create_view.twig') }}
{{ include('modals/change_password.twig') }}

15
templates/modals/change_password.twig Normal file
View File

@ -0,0 +1,15 @@
<div class="modal fade" id="changePasswordModal" tabindex="-1" aria-labelledby="changePasswordModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" id="changePasswordModalDialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="changePasswordModalLabel">{% trans 'Change password' %}</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button>
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" id="changePasswordGoButton">{% trans 'Go' %}</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans 'Cancel' %}</button>
</div>
</div>
</div>
</div>