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

create sync records only if sync is configured. This will prevent sync conflicts after document fork.

Browse Source
This commit is contained in:
azivner
2017-12-13 20:34:21 -05:00
parent 2fa57b79fd
commit 17c90262c2
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/sync_table.js
View File

@@ -1,6 +1,7 @@
const sql = require('./sql');
const source_id = require('./source_id');
const utils = require('./utils');
const sync = require('./sync');
async function addNoteSync(noteId, sourceId) {
await addEntitySync("notes", noteId, sourceId)
@@ -27,12 +28,14 @@ async function addRecentNoteSync(notePath, sourceId) {
}
async function addEntitySync(entityName, entityId, sourceId) {
await sql.replace("sync", {
entity_name: entityName,
entity_id: entityId,
sync_date: utils.nowDate(),
source_id: sourceId || source_id.currentSourceId
});
if (sync.isSyncSetup) {
await sql.replace("sync", {
entity_name: entityName,
entity_id: entityId,
sync_date: utils.nowDate(),
source_id: sourceId || source_id.currentSourceId
});
}
}
module.exports = {