From 5e7cfba8d871af2c44ffcb03adb7e4c9e8305ef5 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Mon, 12 Dec 2011 16:09:37 +0000 Subject: [PATCH 1/3] Use PMA_convertFootnotesToTooltips() in ajax "add user" functionality --- js/server_privileges.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index c6636f3242..81856ca164 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -246,7 +246,7 @@ $(document).ready(function() { button_options[PMA_messages['strCancel']] = function() { $(this).dialog("close").remove(); } $.get($(this).attr("href"), {'ajax_request':true}, function(data) { - $('
') + var $div = $('
') .prepend(data) .find("#fieldset_add_user_footer").hide() //showing the "Go" and "Create User" buttons together will confuse the user .end() @@ -263,6 +263,7 @@ $(document).ready(function() { buttons: button_options }); //dialog options end displayPasswordGenerateButton(); + PMA_convertFootnotesToTooltips($div); PMA_ajaxRemoveMessage($msgbox); }); // end $.get() From 716b48ed78ab624f304272f3d8d4434b5336dfe0 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Mon, 12 Dec 2011 16:13:40 +0000 Subject: [PATCH 2/3] Use a callback for destroying dialogs --- js/server_privileges.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index 81856ca164..6b9e62209d 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -185,7 +185,7 @@ $(document).ready(function() { //We also need to post the value of the submit button in order to get this to work correctly $.post($form.attr('action'), $form.serialize() + "&adduser_submit=" + $(this).find("input[name=adduser_submit]").attr('value'), function(data) { if (data.success == true) { - $("#add_user_dialog").dialog("close").remove(); + $("#add_user_dialog").dialog("close"); PMA_ajaxShowMessage(data.message); $("#floating_menubar") .next('div') @@ -243,7 +243,7 @@ $(document).ready(function() { } }) }; - button_options[PMA_messages['strCancel']] = function() { $(this).dialog("close").remove(); } + button_options[PMA_messages['strCancel']] = function() { $(this).dialog("close"); }; $.get($(this).attr("href"), {'ajax_request':true}, function(data) { var $div = $('
') @@ -260,7 +260,10 @@ $(document).ready(function() { // also it's interesting to be able to scroll this window height: 600, modal: true, - buttons: button_options + buttons: button_options, + close: function () { + $(this).remove(); + } }); //dialog options end displayPasswordGenerateButton(); PMA_convertFootnotesToTooltips($div); @@ -363,7 +366,7 @@ $(document).ready(function() { * @var button_options Object containing options for jQueryUI dialog buttons */ var button_options = {}; - button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();} + button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close");}; var token = $(this).parents('form').find('input[name="token"]').val(); $.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': true, 'token': token}, function(data) { @@ -372,7 +375,10 @@ $(document).ready(function() { .dialog({ width: 900, height: 600, - buttons: button_options + buttons: button_options, + close: function () { + $(this).remove(); + } }); //dialog options end displayPasswordGenerateButton(); PMA_ajaxRemoveMessage($msgbox); @@ -412,7 +418,7 @@ $(document).ready(function() { PMA_ajaxShowMessage(data.message); //Close the jQueryUI dialog - $("#edit_user_dialog").dialog("close").remove(); + $("#edit_user_dialog").dialog("close"); if(data.sql_query) { $("#floating_menubar") From 6a6b844525a782b148f235a11b77712e1d256280 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Mon, 12 Dec 2011 16:55:30 +0000 Subject: [PATCH 3/3] Fixed bug #3442069 - database list not updated after adding a user + database --- ChangeLog | 1 + js/server_privileges.js | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb00e58d13..77ebdcfdc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ phpMyAdmin - ChangeLog + View editing via a generated ALTER VIEW - bug #3408377 [interface] Deleting table from the DB does not change the table counter + rfe #3438266 [designer] Toggle for relation lines +- bug #3442069 [AJAX] database list not updated after adding/deleting a user + database 3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/js/server_privileges.js b/js/server_privileges.js index 6b9e62209d..db8239d1ba 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -185,6 +185,12 @@ $(document).ready(function() { //We also need to post the value of the submit button in order to get this to work correctly $.post($form.attr('action'), $form.serialize() + "&adduser_submit=" + $(this).find("input[name=adduser_submit]").attr('value'), function(data) { if (data.success == true) { + // Refresh navigation, if we created a database with the name + // that is the same as the username of the new user + if ($('#add_user_dialog #createdb_1:checked').length && window.parent) { + window.parent.refreshNavigation(true); + } + $("#add_user_dialog").dialog("close"); PMA_ajaxShowMessage(data.message); $("#floating_menubar") @@ -225,7 +231,7 @@ $(document).ready(function() { .html(priv_data.user_form) .insertAfter('#result_query'); } else { - PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + priv_data.error, "7000"); + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + priv_data.error, false); } } else { /*parse the JSON string*/ @@ -315,7 +321,11 @@ $(document).ready(function() { $.post($form.attr('action'), $form.serialize() + "&delete=" + $(this).attr('value') + "&ajax_request=true", function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); - + // Refresh navigation, if we droppped some databases with the name + // that is the same as the username of the deleted user + if ($('#checkbox_drop_users_db:checked').length && window.parent) { + window.parent.refreshNavigation(true); + } //Remove the revoked user from the users list $form.find("input:checkbox:checked").parents("tr").slideUp("medium", function() { var this_user_initial = $(this).find('input:checkbox').val().charAt(0).toUpperCase();