Netsyms/PackageHelper
2
0
Fork 1
Code Issues 9 Pull Requests Releases 12 Wiki Activity

Fix issue where a new client will overwrite the server-stored settings on first sync

Browse Source
This commit is contained in:
Skylar Ittner 2020-01-07 16:47:14 -07:00
parent a93d33d18d
commit 756e1e327a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/assets/js/settings.js
View File

@ -12,6 +12,7 @@ function logout() {
function () { function () {
localStorage.removeItem('password'); localStorage.removeItem('password');
localStorage.removeItem('username'); localStorage.removeItem('username');
localStorage.removeItem('lastsync');
restartApplication(); restartApplication();
} }
); );

7
www/assets/js/sync.js
View File

@ -8,8 +8,13 @@
function gatherSyncData() { function gatherSyncData() {
var data = { var data = {
localStorage: {}, localStorage: {},
changed: getStorage("lastchange") == null ? 0 : getStorage("lastchange") changed: getStorage("lastchange") == null ? 0 : getStorage("lastchange"),
}; };
if (!inStorage("lastsync")) {
// first time syncing to the server, let's make sure
// the server settings take precedence
data.changed = 1;
}
var allitems = getAllStorage(); var allitems = getAllStorage();
for (var i = 0; i < allitems.length; i++) { for (var i = 0; i < allitems.length; i++) {
var key = allitems[i].key; var key = allitems[i].key;