Merge pull request #14021 from Gemorroj/patch-2

fix maintenance operations
phpmyadmin · Feb 20, 2018 · ff4527a · ff4527a
2 parents 9efa57d + b35a361
commit ff4527a
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/js/tbl_operations.js b/js/tbl_operations.js
@@ -127,18 +127,25 @@ AJAX.registerOnload('tbl_operations.js', function () {
     **/
     $(document).on('click', '#tbl_maintenance li a.maintain_action.ajax', function (event) {
         event.preventDefault();
+        var $link = $(this);
+
         if ($('.sqlqueryresults').length !== 0) {
             $('.sqlqueryresults').remove();
         }
         if ($('.result_query').length !== 0) {
             $('.result_query').remove();
         }
         // variables which stores the common attributes
-        var params = {
+        var params = $.param({
             ajax_request: 1,
             server: PMA_commonParams.get('server')
-        };
-        $.post($(this).attr('href'), params, function (data) {
+        });
+        var postData = $link.getPostData();
+        if (postData) {
+            params += '&' + postData;
+        }
+
+        $.post($link.attr('href'), params, function (data) {
             function scrollToTop () {
                 $('html, body').animate({ scrollTop: 0 });
             }
@@ -150,7 +157,7 @@ AJAX.registerOnload('tbl_operations.js', function () {
                 PMA_highlightSQL($('#page_content'));
                 scrollToTop();
             } else if (typeof data !== 'undefined' && data.success === true) {
-                var $temp_div = $('<div id=\'temp_div\'></div>');
+                $temp_div = $('<div id=\'temp_div\'></div>');
                 $temp_div.html(data.message);
                 var $success = $temp_div.find('.result_query .success');
                 PMA_ajaxShowMessage($success);
@@ -163,7 +170,14 @@ AJAX.registerOnload('tbl_operations.js', function () {
             } else {
                 $temp_div = $('<div id=\'temp_div\'></div>');
                 $temp_div.html(data.error);
-                var $error = $temp_div.find('code').addClass('error');
+
+                var $error;
+                if ($temp_div.find('.error code').length !== 0) {
+                    $error = $temp_div.find('.error code').addClass('error');
+                } else {
+                    $error = $temp_div;
+                }
+
                 PMA_ajaxShowMessage($error, false);
             }
         }); // end $.post()