Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-10 15:25:51 +01:00
Code Issues Packages Projects Releases Activity

fix bug overwriting entity changes

Browse Source
This commit is contained in:
zadam
2021-11-17 21:47:41 +01:00
parent 7d64f6a7dd
commit 298af217e9
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/sync_update.js
View File

@@ -54,7 +54,7 @@ function updateNormalEntity(remoteEntityChange, entity) {
sql.execute(`DELETE FROM ${remoteEntityChange.entityName} WHERE ${primaryKey} = ?`, remoteEntityChange.entityId);
entityChangesService.addEntityChange(remoteEntityChange, true);
entityChangesService.addEntityChange(remoteEntityChange);
});
return true;
@@ -71,7 +71,7 @@ function updateNormalEntity(remoteEntityChange, entity) {
sql.transactional(() => {
sql.replace(remoteEntityChange.entityName, entity);
entityChangesService.addEntityChange(remoteEntityChange, true);
entityChangesService.addEntityChange(remoteEntityChange);
});
return true;
@@ -86,7 +86,7 @@ function updateNoteReordering(entityChange, entity) {
sql.execute("UPDATE branches SET notePosition = ? WHERE branchId = ?", [entity[key], key]);
}
entityChangesService.addEntityChange(entityChange, true);
entityChangesService.addEntityChange(entityChange);
});
return true;