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

sync fixes

Browse Source
This commit is contained in:
zadam
2021-06-29 23:45:45 +02:00
parent b660238a40
commit 5be7f003ca
5 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/services/entity_changes.js
View File

@@ -25,8 +25,8 @@ function insertEntityChange(entityName, entityId, hash, isErased, utcDateChanged
return entityChange;
}
function addEntityChange(entityChange, sourceId, isSynced) {
const localEntityChange = insertEntityChange(entityChange.entityName, entityChange.entityId, entityChange.hash, entityChange.isErased, entityChange.utcDateChanged, sourceId, isSynced);
function addEntityChange(entityChange, sourceId) {
const localEntityChange = insertEntityChange(entityChange.entityName, entityChange.entityId, entityChange.hash, entityChange.isErased, entityChange.utcDateChanged, sourceId, entityChange.isSynced);
cls.addEntityChange(localEntityChange);
}
@@ -37,7 +37,8 @@ function addNoteReorderingEntityChange(parentNoteId, sourceId) {
entityId: parentNoteId,
hash: 'N/A',
isErased: false,
utcDateChanged: dateUtils.utcNowDateTime()
utcDateChanged: dateUtils.utcNowDateTime(),
isSynced: true
}, sourceId);
const eventService = require('./events');
@@ -104,7 +105,8 @@ function fillEntityChanges(entityName, entityPrimaryKey, condition = '') {
entityId,
hash: entity.generateHash(),
isErased: false,
utcDateChanged: entity.getUtcDateChanged()
utcDateChanged: entity.getUtcDateChanged(),
isSynced: entityName !== 'options' || !!entity.isSynced
}, null);
}
}