mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 18:36:30 +01:00 
			
		
		
		
	fixes
This commit is contained in:
		| @@ -104,7 +104,7 @@ function getKeyboardDefaultOptions() { | ||||
|         .filter(ka => !!ka.actionName) | ||||
|         .map(ka => { | ||||
|             return { | ||||
|                 name: "keyboardShortcuts" + ka.actionName, | ||||
|                 name: "keyboardShortcuts" + ka.actionName.charAt(0).toUpperCase() + ka.actionName.slice(1), | ||||
|                 value: JSON.stringify(ka.defaultShortcuts), | ||||
|                 isSynced: false | ||||
|             }; | ||||
|   | ||||
| @@ -156,8 +156,11 @@ async function pullSync(syncContext) { | ||||
|                     appliedPulls++; | ||||
|                 } | ||||
|  | ||||
|                 // can be undefined for options with isSynced=false | ||||
|                 if (entity) { | ||||
|                     await syncUpdateService.updateEntity(sync, entity, syncContext.sourceId); | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             stats.outstandingPulls = resp.maxSyncId - sync.id; | ||||
|         } | ||||
| @@ -318,6 +321,8 @@ async function getSyncRecords(syncs) { | ||||
|         const entity = await getEntityRow(sync.entityName, sync.entityId); | ||||
|  | ||||
|         if (sync.entityName === 'options' && !entity.isSynced) { | ||||
|             records.push({sync}); | ||||
|  | ||||
|             continue; | ||||
|         } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user