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

Merge pull request #1306 from D-storm/nav-fix

Browse Source 
fix navigation token mismatch error after relogin
This commit is contained in:
Isaac Bennetch 2014-07-30 23:29:44 -04:00
commit 8a7dfa1d2f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/navigation.js
View File

@ -290,7 +290,9 @@ $(function () {
if (typeof storage.navTree === 'undefined') {
PMA_showCurrentNavigation();
navTreeStateUpdate();
} else if (PMA_commonParams.get('server') === storage.server) {
} else if (PMA_commonParams.get('server') === storage.server &&
PMA_commonParams.get('token') === storage.token
) {
// Restore the tree from storage
$('#pma_navigation_tree_content').html(storage.navTree);
$('div.pageselector.dbselector').html(storage.page);
@ -314,12 +316,14 @@ function navTreeStateUpdate() {
try {
storage.setItem('navTree', $('#pma_navigation_tree_content').html());
storage.setItem('server', PMA_commonParams.get('server'));
storage.setItem('token', PMA_commonParams.get('token'));
storage.setItem('page', $('div.pageselector.dbselector').html());
} catch(error) {
// storage capacity exceeded & old navigation tree
// state is no more valid, so remove it
storage.removeItem('navTree');
storage.removeItem('server');
storage.removeItem('token');
storage.removeItem('page');
}
}