From e58dd74c40a10d79628de70b6a5b0856940fee2c Mon Sep 17 00:00:00 2001 From: Piyush Vijay Date: Mon, 16 Apr 2018 19:33:28 +0530 Subject: [PATCH] Remember table's sorting broken in 4.8.0 issue: #14189 fixed Signed-off-by: Piyush Vijay --- js/sql.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/js/sql.js b/js/sql.js index 11e7543c76..26e42ed5b1 100644 --- a/js/sql.js +++ b/js/sql.js @@ -167,9 +167,17 @@ AJAX.registerOnload('sql.js', function () { PMA_autosaveSQL($('#sqlquery').val()); }); // Save sql query with sort - $('select[name="sql_query"]').on('change', function () { - PMA_autosaveSQLSort($('select[name="sql_query"]').val()); - }); + if ($('#RememberSorting') !== undefined && $('#RememberSorting').is(':checked')) { + $('select[name="sql_query"]').on('change', function () { + PMA_autosaveSQLSort($('select[name="sql_query"]').val()); + }); + } else { + if (isStorageSupported('localStorage') && window.localStorage.auto_saved_sql_sort !== undefined) { + window.localStorage.removeItem('auto_saved_sql_sort'); + } else { + Cookies.set('auto_saved_sql_sort', ''); + } + } // If sql query with sort for current table is stored, change sort by key select value var sortStoredQuery = (isStorageSupported('localStorage') && typeof window.localStorage.auto_saved_sql_sort !== 'undefined') ? window.localStorage.auto_saved_sql_sort : Cookies.get('auto_saved_sql_sort'); if (typeof sortStoredQuery !== 'undefined' && sortStoredQuery !== $('select[name="sql_query"]').val() && $('select[name="sql_query"] option[value="' + sortStoredQuery + '"]').length !== 0) {