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

Fixed the empty notice divison being generated when PMA_showMessage() was being passed a NULL query

Browse Source
This commit is contained in:
ninadsp
2010-07-12 23:11:41 +05:30
parent f06bb69bb8
commit 7d3245cbcd
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/db_operations.js
View File

@@ -44,6 +44,12 @@ $(document).ready(function() {
.end() .end()
.after(data.sql_query); .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();
}
$("<span>" + PMA_messages['strReloadDatabase'] + "?</span>").dialog({ $("<span>" + PMA_messages['strReloadDatabase'] + "?</span>").dialog({
buttons: button_options buttons: button_options
}) //end dialog options }) //end dialog options

12
js/server_privileges.js
View File

@@ -138,13 +138,19 @@ $(document).ready(function() {
.remove() .remove()
.end() .end()
.after(data.sql_query); .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();
}
} }
else { else {
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000"); PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000");
} }
}) })
}; };
button_options[PMA_messages['strCancel']] = function() { $(this).dialog("close").remove(); } button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();}
$.get($(this).attr("href"), {'ajax_request':true}, function(data) { $.get($(this).attr("href"), {'ajax_request':true}, function(data) {
$('<div id="add_user_dialog"></div>') $('<div id="add_user_dialog"></div>')
@@ -207,7 +213,7 @@ $(document).ready(function() {
PMA_ajaxShowMessage(); PMA_ajaxShowMessage();
var button_options = {}; var button_options = {};
button_options[PMA_messages['strCancel']] = function() { $(this).dialog("close").remove(); } button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();}
$.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': true}, function(data) { $.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': true}, function(data) {
$('<div id="edit_user_dialog"></div>') $('<div id="edit_user_dialog"></div>')
@@ -248,7 +254,7 @@ $(document).ready(function() {
PMA_ajaxShowMessage(); PMA_ajaxShowMessage();
var button_options = {}; var button_options = {};
button_options[PMA_messages['strClose']] = function() { $(this).dialog("close").remove(); } button_options[PMA_messages['strClose']] = function() {$(this).dialog("close").remove();}
$.get($(this).attr('href'), {'ajax_request': true}, function(data) { $.get($(this).attr('href'), {'ajax_request': true}, function(data) {
$('<div id="export_dialog"></div>') $('<div id="export_dialog"></div>')

7
js/tbl_change.js
View File

@@ -270,6 +270,13 @@ $(document).ready(function() {
.remove() .remove()
.end() .end()
.after(data.sql_query); .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();
}
$(the_form).find('input:reset').trigger('click'); $(the_form).find('input:reset').trigger('click');
} }
else { else {