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

sync fixes

Browse Source
This commit is contained in:
zadam
2020-08-27 22:11:17 +02:00
parent ef996f3919
commit 355780c595
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/routes/api/sync.js
View File

@@ -139,11 +139,10 @@ function getChanged(req) {
} }
function update(req) { function update(req) {
const sourceId = req.body.sourceId; const {sourceId, entities} = req.body;
const entities = req.body.entities;
for (const {sync, entity} of entities) { for (const {entityChange, entity} of entities) {
syncUpdateService.updateEntity(sync, entity, sourceId); syncUpdateService.updateEntity(entityChange, entity, sourceId);
} }
} }

6
src/services/sync_update.js
View File

@@ -3,13 +3,13 @@ const log = require('./log');
const entityChangesService = require('./entity_changes.js'); const entityChangesService = require('./entity_changes.js');
const eventService = require('./events'); const eventService = require('./events');
function updateEntity(sync, entity, sourceId) { function updateEntity(entityChange, entity, sourceId) {
// can be undefined for options with isSynced=false // can be undefined for options with isSynced=false
if (!entity) { if (!entity) {
return false; return false;
} }
const {entityName} = sync; const {entityName} = entityChange;
let updated; let updated;
if (entityName === 'notes') { if (entityName === 'notes') {
@@ -28,7 +28,7 @@ function updateEntity(sync, entity, sourceId) {
updated = updateNoteRevisionContent(entity, sourceId); updated = updateNoteRevisionContent(entity, sourceId);
} }
else if (entityName === 'note_reordering') { else if (entityName === 'note_reordering') {
updated = updateNoteReordering(sync.entityId, entity, sourceId); updated = updateNoteReordering(entityChange.entityId, entity, sourceId);
} }
else if (entityName === 'options') { else if (entityName === 'options') {
updated = updateOptions(entity, sourceId); updated = updateOptions(entity, sourceId);