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

bug fixes

Browse Source
This commit is contained in:
zadam 2021-09-07 22:56:54 +02:00
parent f0af26a57b
commit 79d492d0f0
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/services/entity_changes.js
View File

@ -7,10 +7,13 @@ const becca = require("../becca/becca");
let maxEntityChangeId = 0; let maxEntityChangeId = 0;
function addEntityChange(origEntityChange) { function addEntityChange(origEntityChange, keepOriginalId = false) {
const ec = {...origEntityChange}; const ec = {...origEntityChange};
delete ec.id; if (!keepOriginalId) {
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;
ec.isErased = ec.isErased ? 1 : 0; ec.isErased = ec.isErased ? 1 : 0;

8
src/services/sync_update.js
View File

@ -9,7 +9,7 @@ function updateEntity(entityChange, entityRow) {
if (!entityRow) { if (!entityRow) {
if (entityChange.isSynced) { if (entityChange.isSynced) {
if (entityChange.isErased) { if (entityChange.isErased) {
entityChangesService.addEntityChange(entityChange); entityChangesService.addEntityChange(entityChange, true);
} }
else { else {
log.info(`Encountered synced non-erased entity change without entity: ${JSON.stringify(entityChange)}`); log.info(`Encountered synced non-erased entity change without entity: ${JSON.stringify(entityChange)}`);
@ -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); entityChangesService.addEntityChange(remoteEntityChange, true);
}); });
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); entityChangesService.addEntityChange(remoteEntityChange, true);
}); });
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); entityChangesService.addEntityChange(entityChange, true);
}); });
return true; return true;