fix rouge local configs overriding sync config
This commit is contained in:
parent
2ab1d86d92
commit
e202f18720
6 changed files with 48 additions and 36 deletions
|
|
@ -25,8 +25,13 @@ export const useMergedConfigStore = defineStore('merged_config', {
|
|||
const localPrefs = useLocalConfigStore().prefsStorage
|
||||
const syncPrefs = useSyncConfigStore().prefsStorage
|
||||
|
||||
const getValue = (k) =>
|
||||
tempPrefs[k] ?? localPrefs[k] ?? syncPrefs.simple[k]
|
||||
const getValue = (k) => {
|
||||
if (LOCAL_ONLY_KEYS.has(k)) {
|
||||
return tempPrefs[k] ?? localPrefs[k] ?? syncPrefs.simple[k]
|
||||
} else {
|
||||
return tempPrefs[k] ?? syncPrefs.simple[k]
|
||||
}
|
||||
}
|
||||
const getDefault = (k) => instancePrefs[k] ?? ROOT_CONFIG[k]
|
||||
|
||||
const result = Object.fromEntries(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue