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

Merge remote-tracking branch 'origin/stable' into next

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
zadam
2021-05-15 22:45:11 +02:00
parent 8a9bd4deb4 f6dd1110e8
commit 9645a07f2f
7 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/services/sync.js
View File

@@ -334,6 +334,7 @@ function getEntityChangesRecords(entityChanges) {
const entity = getEntityChangeRow(entityChange.entityName, entityChange.entityId);
if (entityChange.entityName === 'options' && !entity.isSynced) {
// if non-synced entities should count towards "lastSyncedPush"
records.push({entityChange});
continue;
@@ -358,7 +359,8 @@ function getLastSyncedPull() {
}
function setLastSyncedPull(entityChangeId) {
optionService.setOption('lastSyncedPull', entityChangeId);
// this way we avoid updating entity_changes which otherwise means that we've never pushed all entity_changes
sql.execute("UPDATE options SET value = ? WHERE name = ?", [entityChangeId, 'lastSyncedPull']);
}
function getLastSyncedPush() {
@@ -372,7 +374,8 @@ function getLastSyncedPush() {
function setLastSyncedPush(entityChangeId) {
ws.setLastSyncedPush(entityChangeId);
optionService.setOption('lastSyncedPush', entityChangeId);
// this way we avoid updating entity_changes which otherwise means that we've never pushed all entity_changes
sql.execute("UPDATE options SET value = ? WHERE name = ?", [entityChangeId, 'lastSyncedPush']);
}
function getMaxEntityChangeId() {