Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorMaurĂ­cio Meneghini Fauth <mauriciofauth@gmail.com>2018-05-04 08:40:54 +0300
committerGitHub <noreply@github.com>2018-05-04 08:40:54 +0300
commit2f824e55089fd8e9ed0d6c1fea7a61d42e4dade2 (patch)
tree195d8b92e7b60b7efdeda82199f2fc3cf447aaf2 /js
parentdcb2aec958efff7e1c073b7179c59fac0e6ab4c8 (diff)
parentefaf47050a89974af613ad1be0b216eebb441195 (diff)
Merge pull request #14216 from Piyush3079/PMA_14212
Fix XML Export fatal error and add Move columns preview SQL
Diffstat (limited to 'js')
-rw-r--r--js/tbl_structure.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index bb26f3b8bb..92808d94b9 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -297,14 +297,12 @@ AJAX.registerOnload('tbl_structure.js', function () {
var $this = $(this);
var $form = $this.find('form');
var serialized = $form.serialize();
-
// check if any columns were moved at all
if (serialized === $form.data('serialized-unmoved')) {
PMA_ajaxRemoveMessage($msgbox);
$this.dialog('close');
return;
}
-
$.post($form.prop('action'), serialized + PMA_commonParams.get('arg_separator') + 'ajax_request=true', function (data) {
if (data.success === false) {
PMA_ajaxRemoveMessage($msgbox);
@@ -347,6 +345,11 @@ AJAX.registerOnload('tbl_structure.js', function () {
}
});
};
+ button_options[PMA_messages.strPreviewSQL] = function () {
+ // Function for Previewing SQL
+ var $form = $('#move_column_form');
+ PMA_previewSQL($form);
+ };
button_options[PMA_messages.strCancel] = function () {
$(this).dialog('close');
};