gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13672 from jakubstanecki/bug/13044-remembersorting-table-uiprefs-not-saving-when-using-the-sort-by-key-select

Browse Source 
Added remember table sorting when browsing table

Fix #13044
This commit is contained in:
Maurício Meneghini Fauth 2017-09-14 10:47:52 -03:00 committed by GitHub
commit 010e455796
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/sql.js
View File

@ -37,7 +37,7 @@ function PMA_urlencode(str)
}
/**
* Saves SQL query in local storage or cooie
* Saves SQL query in local storage or cookie
*
* @param string SQL query
* @return void
@ -53,6 +53,23 @@ function PMA_autosaveSQL(query)
}
}
/**
* Saves SQL query with sort in local storage or cookie
*
* @param string SQL query
* @return void
*/
function PMA_autosaveSQLSort(query)
{
if (query) {
if (isStorageSupported('localStorage')) {
window.localStorage.auto_saved_sql_sort = query;
} else {
Cookies.set('auto_saved_sql_sort', query);
}
}
}
/**
* Get the field name for the current field. Required to construct the query
* for grid editing
@ -158,6 +175,15 @@ AJAX.registerOnload('sql.js', function () {
$('#sqlquery').on('input propertychange', 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 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) {
$('select[name="sql_query"]').val(sortStoredQuery).change();
}
}
});