gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
zadam 2020-02-19 22:09:02 +01:00
parent 52f4876f2d
commit d9fb36a9a6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/options_init.js
View File

@ -104,7 +104,7 @@ function getKeyboardDefaultOptions() {
.filter(ka => !!ka.actionName) .filter(ka => !!ka.actionName)
.map(ka => { .map(ka => {
return { return {
name: "keyboardShortcuts" + ka.actionName, name: "keyboardShortcuts" + ka.actionName.charAt(0).toUpperCase() + ka.actionName.slice(1),
value: JSON.stringify(ka.defaultShortcuts), value: JSON.stringify(ka.defaultShortcuts),
isSynced: false isSynced: false
}; };

7
src/services/sync.js
View File

@ -156,7 +156,10 @@ async function pullSync(syncContext) {
appliedPulls++; appliedPulls++;
} }
await syncUpdateService.updateEntity(sync, entity, syncContext.sourceId); // can be undefined for options with isSynced=false
if (entity) {
await syncUpdateService.updateEntity(sync, entity, syncContext.sourceId);
}
} }
stats.outstandingPulls = resp.maxSyncId - sync.id; stats.outstandingPulls = resp.maxSyncId - sync.id;
@ -318,6 +321,8 @@ async function getSyncRecords(syncs) {
const entity = await getEntityRow(sync.entityName, sync.entityId); const entity = await getEntityRow(sync.entityName, sync.entityId);
if (sync.entityName === 'options' && !entity.isSynced) { if (sync.entityName === 'options' && !entity.isSynced) {
records.push({sync});
continue; continue;
} }