Merge branch 'QA_4_2'

Conflicts: js/sql.js Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Nov 4, 2014 · 4d16273 · 4d16273
2 parents 1390d13 + eef8565
commit 4d16273
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -56,7 +56,8 @@ phpMyAdmin - ChangeLog
 - bug #4564 Designer: spaces in table name with edit table link generates bad links
 
 4.2.12.0 (not yet released)
-- bug #4574 Blank/white page when JavaScript disabled 
+- bug #4574 Blank/white page when JavaScript disabled
+- bug #4577 Multi row actions cause full page reloads
 
 4.2.11.0 (2014-10-31)
 - bug       ReferenceError: Table_onover is not defined

diff --git a/js/sql.js b/js/sql.js
@@ -103,6 +103,7 @@ AJAX.registerTeardown('sql.js', function () {
     $('body').off('click','a.browse_foreign');
     $('body').off('click', '#simulate_dml');
     $('body').off('keyup', '#sqlqueryform');
+    $('body').off('click', '#resultsForm.ajax button[name="submit_mult"]');
 });
 
 /**
@@ -524,6 +525,17 @@ AJAX.registerOnload('sql.js', function () {
             }
         });
     });
+
+    /**
+     * Handles mutli submits of results browsing page such as edit, delete and export
+     */
+    $('body').on('click', '#resultsForm.ajax button[name="submit_mult"]', function (e) {
+        e.preventDefault();
+        var $button = $(this);
+        var $form = $button.parent('form');
+        var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val();
+        PMA_ajaxShowMessage();
+        $.get($form.attr('action'), submitData, AJAX.responseHandler);
 }); // end $()
 
 /**