gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix erase sync

Browse Source
This commit is contained in:
zadam 2024-01-10 23:51:53 +01:00
parent 2c7b774356
commit 76c9873705
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/sync_update.js
View File

@ -73,7 +73,6 @@ function updateNormalEntity(remoteEC, remoteEntityRow, instanceId, updateContext
if (localEC?.isErased) { if (localEC?.isErased) {
eraseEntity(remoteEC); // make sure it's erased anyway eraseEntity(remoteEC); // make sure it's erased anyway
updateContext.alreadyErased++; updateContext.alreadyErased++;
return false; // we won't save entitychange in this case
} else { } else {
eraseEntity(remoteEC); eraseEntity(remoteEC);
updateContext.erased++; updateContext.erased++;
@ -91,7 +90,8 @@ function updateNormalEntity(remoteEC, remoteEntityRow, instanceId, updateContext
updateContext.updated[remoteEC.entityName].push(remoteEC.entityId); updateContext.updated[remoteEC.entityName].push(remoteEC.entityId);
} }
if (!localEC || localEC.utcDateChanged < remoteEC.utcDateChanged if (!localEC
|| localEC.utcDateChanged < remoteEC.utcDateChanged
|| localEC.hash !== remoteEC.hash || localEC.hash !== remoteEC.hash
|| localEC.isErased !== remoteEC.isErased || localEC.isErased !== remoteEC.isErased
) { ) {