diff options
author | Madhura Jayaratne <madhura.cj@gmail.com> | 2018-05-14 22:25:45 +0300 |
---|---|---|
committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2018-05-14 22:25:45 +0300 |
commit | 38c800c9720ca7f33d5dec4b38f5c846a7835664 (patch) | |
tree | 86f9b71956a6ca6bfd7a78fe8b5f782f9411842f /js | |
parent | 2e1a4ebf6f1f769ad18948e2481dca0b9b30a908 (diff) |
Fix #14289 Fix multi-column sorting
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'js')
-rw-r--r-- | js/multi_column_sort.js | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/js/multi_column_sort.js b/js/multi_column_sort.js index 23eb069177..88b3807cca 100644 --- a/js/multi_column_sort.js +++ b/js/multi_column_sort.js @@ -49,27 +49,32 @@ function removeColumnFromMultiSort (target, parent) { // is remembered via the RememberSorting directive URL.tail += PMA_commonParams.get('arg_separator') + 'discard_remembered_sort=1'; } + URL.head = URL.head.substring(URL.head.indexOf('?') + 1); var middle_part = columns.join('%2C+'); - url = URL.head + middle_part + URL.tail; - return url; + params = URL.head + middle_part + URL.tail; + return params; } AJAX.registerOnload('keyhandler.js', function () { $('th.draggable.column_heading.pointer.marker a').on('click', function (event) { var url = $(this).parent().find('input').val(); + var argsep = PMA_commonParams.get('arg_separator') if (event.ctrlKey || event.altKey) { event.preventDefault(); - url = removeColumnFromMultiSort(url, $(this).parent()); - if (url) { + var params = removeColumnFromMultiSort(url, $(this).parent()); + if (params) { AJAX.source = $(this); PMA_ajaxShowMessage(); - $.get(url, { 'ajax_request' : true, 'ajax_page_request' : true }, AJAX.responseHandler); + params += argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true'; + $.post('sql.php', params, AJAX.responseHandler); } } else if (event.shiftKey) { event.preventDefault(); AJAX.source = $(this); PMA_ajaxShowMessage(); - $.get(url, { 'ajax_request' : true, 'ajax_page_request' : true }, AJAX.responseHandler); + var params = url.substring(url.indexOf('?') + 1); + params += argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true'; + $.post('sql.php', params, AJAX.responseHandler); } }); }); |