Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +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

2
package.json
View File

@@ -81,7 +81,7 @@
}, },
"devDependencies": { "devDependencies": {
"cross-env": "7.0.3", "cross-env": "7.0.3",
"electron": "13.6.1", "electron": "13.6.2",
"electron-builder": "22.13.1", "electron-builder": "22.13.1",
"electron-packager": "15.4.0", "electron-packager": "15.4.0",
"electron-rebuild": "3.2.3", "electron-rebuild": "3.2.3",

6
src/services/entity_changes.js
View File

@@ -7,12 +7,10 @@ const becca = require("../becca/becca");
let maxEntityChangeId = 0; let maxEntityChangeId = 0;
function addEntityChange(origEntityChange, keepOriginalId = false) { function addEntityChange(origEntityChange) {
const ec = {...origEntityChange}; const ec = {...origEntityChange};
if (!keepOriginalId) { delete ec.id;
delete ec.id;
}
ec.sourceId = ec.sourceId || cls.getSourceId() || sourceIdService.getCurrentSourceId(); ec.sourceId = ec.sourceId || cls.getSourceId() || sourceIdService.getCurrentSourceId();
ec.isSynced = ec.isSynced ? 1 : 0; ec.isSynced = ec.isSynced ? 1 : 0;

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