gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-05 01:18:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix pulling changes

Browse Source
This commit is contained in:
azivner 2017-12-16 12:21:56 -05:00
parent 4381d88524
commit 0c0e95b91e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/build.js
View File

@ -1 +1 @@
module.exports = { build_date:"2017-12-14T23:29:35-05:00", build_revision: "612c7d9144a943e180cf8d38a1cffe65a0b7525a" };
module.exports = { build_date:"2017-12-16T09:02:14-05:00", build_revision: "4381d885243568fe5d4c60dce36bf0c2f98507fe" };

2
services/sync.js
View File

@ -127,7 +127,7 @@ async function pullSync(syncContext) {
const resp = await syncRequest(syncContext, 'GET', "/api/sync/" + sync.entity_name + "/" + encodeURIComponent(sync.entity_id));
if (!resp || !resp.entity) {
if (!resp || (sync.entity_name === 'notes' && !resp.entity)) {
log.error(`Empty response to pull for sync #${sync.id} ${sync.entity_name}, id=${sync.entity_id}`);
}
else if (sync.entity_name === 'notes') {