The branch, master has been updated via af0591e1904ecdf61714673f7955b15629aa369e (commit) from 00d786e9833b89ac9e865ed5bc972196f8259cca (commit)
- Log ----------------------------------------------------------------- commit af0591e1904ecdf61714673f7955b15629aa369e Author: Marc Delisle marc@infomarc.info Date: Sun Oct 31 17:24:40 2010 -0400
re-indent
-----------------------------------------------------------------------
Summary of changes: js/server_privileges.js | 65 +++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/js/server_privileges.js b/js/server_privileges.js index 519f9f9..db0d609 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -164,40 +164,39 @@ $(document).ready(function() { var button_options = {}; button_options[PMA_messages['strCreateUser']] = function() {
- /** - * @var the_form stores reference to current form - */ - var the_form = $(this).find("#addUsersForm"); - - if( ! checkAddUser($(the_form).get(0)) ) { - PMA_ajaxShowMessage(PMA_messages['strFormEmpty']); - return false; - } - - //We also need to post the value of the submit button in order to get this to work correctly - $.post($(the_form).attr('action'), $(the_form).serialize() + "&adduser_submit=" + $(this).find("input[name=adduser_submit]").attr('value'), function(data) { - if(data.success == true) { - $("#add_user_dialog").dialog("close").remove(); - PMA_ajaxShowMessage(data.message); - $("#topmenucontainer") - .next('div') - .remove() - .end() - .after(data.sql_query); + /** + * @var the_form stores reference to current form + */ + var the_form = $(this).find("#addUsersForm"); + + if( ! checkAddUser($(the_form).get(0)) ) { + PMA_ajaxShowMessage(PMA_messages['strFormEmpty']); + return false; + } + + //We also need to post the value of the submit button in order to get this to work correctly + $.post($(the_form).attr('action'), $(the_form).serialize() + "&adduser_submit=" + $(this).find("input[name=adduser_submit]").attr('value'), function(data) { + if(data.success == true) { + $("#add_user_dialog").dialog("close").remove(); + PMA_ajaxShowMessage(data.message); + $("#topmenucontainer") + .next('div') + .remove() + .end() + .after(data.sql_query);
- //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage() - var notice_class = $("#topmenucontainer").next("div").find('.notice'); - if($(notice_class).text() == '') { - $(notice_class).remove(); - } - - appendNewUser(data.new_user_string, data.new_user_initial, data.new_user_initial_string); - } - else { - PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000"); - } - }) - }; + //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage() + var notice_class = $("#topmenucontainer").next("div").find('.notice'); + if($(notice_class).text() == '') { + $(notice_class).remove(); + } + + appendNewUser(data.new_user_string, data.new_user_initial, data.new_user_initial_string); + } else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000"); + } + }) + }; button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();}
$.get($(this).attr("href"), {'ajax_request':true}, function(data) {
hooks/post-receive
-
Marc Delisle