bug #4866 Limit column ordering in index edit dialog

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Apr 23, 2015 · 179e581 · 179e581
1 parent 9e19fcf
commit 179e581
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
 - bug #4862 Misaligned Inline edit field
 - bug #4861 Use of undefined constant PMA_DRIZZLE
 - bug #4865 sprintf(): Too few arguments
+- bug #4866 Limit column ordering in index edit dialog
 
 4.4.3.0 (2015-04-20)
 - bug #4851 PHP errors in login dialogue

diff --git a/js/functions.js b/js/functions.js
@@ -3537,7 +3537,11 @@ function showIndexEditDialog($outer)
     $('#index_columns td').each(function () {
         $(this).css("width", $(this).width() + 'px');
     });
-    $('#index_columns tbody').sortable();
+    $('#index_columns tbody').sortable({
+        axis: 'y',
+        containment: $("#index_columns tbody"),
+        tolerance: 'pointer'
+    });
     PMA_showHints($outer);
     PMA_init_slider();
     // Add a slider for selecting how many columns to add to the index

diff --git a/js/indexes.js b/js/indexes.js
@@ -354,7 +354,11 @@ function PMA_showAddIndexDialog(source_array, array_index, target_columns, col_i
                     $('#index_columns td').each(function () {
                         $(this).css("width", $(this).width() + 'px');
                     });
-                    $('#index_columns tbody').sortable();
+                    $('#index_columns tbody').sortable({
+                        axis: 'y',
+                        containment: $("#index_columns tbody"),
+                        tolerance: 'pointer'
+                    });
                     // We dont need the slider at this moment.
                     $(this).find('fieldset.tblFooters').remove();
                 },