diff --git a/js/functions.js b/js/functions.js index d612d8948d..2e928a01e6 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1954,6 +1954,9 @@ $(document).ready(function() { if ($("#sqlqueryresults").length != 0) { $("#sqlqueryresults").remove(); } + if ($("#result_query").length != 0) { + $("#result_query").remove(); + } if (data.success == true) { PMA_ajaxShowMessage(data.message); $("
").insertAfter("#topmenucontainer"); @@ -1972,30 +1975,39 @@ $(document).ready(function() { /** *Ajax action for submitting the "Copy table" **/ - $("#copyTable.ajax").live('submit', function(event) { + $("#copyTable.ajax input[name='submit_copy']").live('click', function(event) { event.preventDefault(); - $form = $(this); - - PMA_prepareForAjaxRequest($form); - /*variables which stores the common attributes*/ - $.post($form.attr('action'), $form.serialize()+"&submit_copy=Go", function(data) { - if ($("#sqlqueryresults").length != 0) { - $("#sqlqueryresults").remove(); - } - if (data.success == true) { - PMA_ajaxShowMessage(data.message); - $("
").insertAfter("#topmenucontainer"); - $("#sqlqueryresults").html(data.sql_query); - $("#result_query .notice").remove(); - $("#result_query").prepend((data.message)); - $("#copyTable").find("select[name='target_db'] option[value='sakila']").attr('selected', 'selected'); - } else { - $temp_div = $("
") - $temp_div.html(data.error); - $error = $temp_div.find("code").addClass("error"); - PMA_ajaxShowMessage($error); - } - }) // end $.post() + $form = $("#copyTable"); + if($form.find("input[name='switch_to_new']").attr('checked')) { + $form.append(''); + $form.removeClass('ajax'); + $form.find("#ajax_request_hidden").remove(); + $form.submit(); + } else { + PMA_prepareForAjaxRequest($form); + /*variables which stores the common attributes*/ + $.post($form.attr('action'), $form.serialize()+"&submit_copy=Go", function(data) { + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } + if ($("#result_query").length != 0) { + $("#result_query").remove(); + } + if (data.success == true) { + PMA_ajaxShowMessage(data.message); + $("
").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data.sql_query); + $("#result_query .notice").remove(); + $("#result_query").prepend((data.message)); + $("#copyTable").find("select[name='target_db'] option[value="+data.db+"]").attr('selected', 'selected'); + } else { + $temp_div = $("
") + $temp_div.html(data.error); + $error = $temp_div.find("code").addClass("error"); + PMA_ajaxShowMessage($error); + } + }) // end $.post() + } });//end of copyTable ajax submit }, 'top.frame_content'); //end $(document).ready for 'Table operations' diff --git a/tbl_alter.php b/tbl_alter.php index 807a39ec80..6c46c9f2ee 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -130,9 +130,9 @@ if (isset($_REQUEST['do_save_data'])) { } } - if ( $GLOBALS['is_ajax_request'] == true) { + if ( $_REQUEST['ajax_request'] == true) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); - PMA_ajaxResponse($message, $message->isSuccess(),$extra_data); + PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); } $active_page = 'tbl_structure.php'; diff --git a/tbl_move_copy.php b/tbl_move_copy.php index 622a807bf3..58d90f347f 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -66,7 +66,7 @@ if (PMA_isValid($_REQUEST['new_name'])) { $table = $_REQUEST['new_name']; } - if ( $GLOBALS['is_ajax_request'] == true) { + if ( $_REQUEST['ajax_request'] == true) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); $extra_data['db'] = $GLOBALS['db']; PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); diff --git a/tbl_operations.php b/tbl_operations.php index dff735bab7..3e9bdebc4d 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -229,7 +229,7 @@ if (isset($result) && empty($message_to_show)) { $_message = $result ? $message = PMA_Message::success(__('Your SQL query has been executed successfully')) : PMA_Message::error(__('Error')); // $result should exist, regardless of $_message $_type = $result ? 'success' : 'error'; - if ( $GLOBALS['is_ajax_request'] == true) { + if ( $_REQUEST['ajax_request'] == true) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); PMA_ajaxResponse($_message,$_message->isSuccess() ,$extra_data); } @@ -238,7 +238,7 @@ if (isset($result) && empty($message_to_show)) { $_message = new PMA_Message; $_message->addMessages($warning_messages); $_message->isError(true); - if ( $GLOBALS['is_ajax_request'] == true) { + if ( $_REQUEST['ajax_request'] == true) { PMA_ajaxResponse($_message, false); } unset($warning_messages);