Merge branch 'QA_3_5'

This commit is contained in:
J.M 2012-07-01 17:27:19 +02:00
commit f96c97984e
3 changed files with 8 additions and 6 deletions

View File

@ -45,6 +45,9 @@ VerboseMultiSubmit, ReplaceHelpImg
+ rfe #3528994 [interface] Allow wrapping possibly long values in replication-status table
3.5.3.0 (not yet released)
- bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore
- bug #3534979 [interface] Copy Database Ajax feedback vanishes long before copying is done
- bug #3527531 [interface] GC-maxlifetime warning incorrectly displayed
3.5.2.0 (not yet released)
- bug #3521416 [interface] JS error when editing index

View File

@ -45,7 +45,7 @@ $(function() {
button_options[PMA_messages['strNo']] = function() { $(this).dialog("close").remove(); }
$form.PMA_confirm(question, $form.attr('action'), function(url) {
PMA_ajaxShowMessage(PMA_messages['strRenamingDatabases']);
PMA_ajaxShowMessage(PMA_messages['strRenamingDatabases'], false);
$.get(url, $("#rename_db_form").serialize() + '&is_js_confirmed=1', function(data) {
if(data.success == true) {
@ -84,7 +84,7 @@ $(function() {
$("#copy_db_form.ajax").live('submit', function(event) {
event.preventDefault();
var $msgbox = PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase']);
PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase'], false);
var $form = $(this);
@ -94,7 +94,7 @@ $(function() {
// use messages that stay on screen
$('div.success, div.error').fadeOut();
if(data.success == true) {
$('#floating_menubar').after(data.message);
PMA_ajaxShowMessage(data.message);
if( $("#checkbox_switch").is(":checked")) {
window.parent.db = data.newname;
window.parent.refreshMain();
@ -106,10 +106,8 @@ $(function() {
window.parent.refreshNavigation(true);
}
} else {
$('#floating_menubar').after(data.error);
PMA_ajaxShowMessage(data.error, false);
}
PMA_ajaxRemoveMessage($msgbox);
}) // end $.get
}) // end copy database

View File

@ -18,4 +18,5 @@ if (! PMA_isValid($_GET['url'])
} else {
header('Location: ' . $_GET['url']);
}
die();
?>