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

Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2

Browse Source
This commit is contained in:
Weblate 2014-05-31 21:30:58 +02:00
commit 1c14cd3e4e
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
- bug #4405 Cannot import (open_basedir)
- bug #4396 Problem copying constraints (such as Sakila)
- bug #4433 Missing privileges submenu
- bug #4394 Drop db confirmation message when dropping a user
4.2.2.0 (2014-05-20)
- bug #4388 Disable database expansion when enabled throws Error 500 when database name is clicked in navigation tree

23
js/server_privileges.js
View File

@ -262,6 +262,15 @@ AJAX.registerOnload('server_privileges.js', function () {
$("#fieldset_delete_user_footer #buttonGo.ajax").live('click', function (event) {
event.preventDefault();
$drop_users_db_checkbox = $("#checkbox_drop_users_db");
if ($drop_users_db_checkbox.is(':checked')) {
var is_confirmed = confirm(PMA_messages.strDropDatabaseStrongWarning + '\n' + $.sprintf(PMA_messages.strDoYouReally, 'DROP DATABASE'));
if (! is_confirmed) {
// Uncheck the drop users database checkbox
$drop_users_db_checkbox.prop('checked', false);
}
}
PMA_ajaxShowMessage(PMA_messages.strRemovingSelectedUsers);
var $form = $("#usersForm");
@ -673,20 +682,6 @@ AJAX.registerOnload('server_privileges.js', function () {
}); // end $.get
}); // end of the paginate users table
/*
* Additional confirmation dialog after clicking
* 'Drop the databases...'
*/
$('#checkbox_drop_users_db').click(function () {
var $this_checkbox = $(this);
if ($this_checkbox.is(':checked')) {
var is_confirmed = confirm(PMA_messages.strDropDatabaseStrongWarning + '\n' + $.sprintf(PMA_messages.strDoYouReally, 'DROP DATABASE'));
if (! is_confirmed) {
$this_checkbox.prop('checked', false);
}
}
});
displayPasswordGenerateButton();
/*