Merge branch 'QA_4_2'

Conflicts:
	js/sql.js

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 23d4e066cc..bca3eb3ddb 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -78,6 +78,7 @@ AJAX.registerTeardown('tbl_structure.js', function () {
     $("a.add_unique_anchor.ajax").die('click');
     $("#move_columns_anchor").die('click');
     $(".append_fields_form.ajax").unbind('submit');
+    $('body').off('click', '#fieldsForm.ajax button[name="submit_mult"], #fieldsForm.ajax input[name="submit_mult"]');
 });
 
 AJAX.registerOnload('tbl_structure.js', function () {
@@ -506,6 +507,21 @@ AJAX.registerOnload('tbl_structure.js', function () {
             }
         });
     });
+
+    /**
+     * Handles mutli submits in table structure page such as browse, drop, primary etc.
+     * However this does not handle multiple field changes. It is handled by a seperate handler.
+     */
+    $('body').on('click', '#fieldsForm.ajax button[name="submit_mult"], #fieldsForm.ajax input[name="submit_mult"]', function (e) {
+        var $button = $(this);
+        if (! $button.is('.change_columns_anchor.ajax')) {
+            e.preventDefault();
+            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);
+        }
+    });
 });
 
 /** Handler for "More" dropdown in structure table rows */