hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

take local config into account for mergedConfig

Browse source
This commit is contained in:
Henry Jameson 2026-02-27 15:08:41 +02:00
commit 24be3da17e
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/stores/sync_config.js
View file

@ -17,7 +17,8 @@ import { toRaw } from 'vue'
import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/update_notification.js' import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/update_notification.js'
import { useInstanceStore } from 'src/stores/instance' import { useInstanceStore } from 'src/stores/instance.js'
import { useLocalConfigStore } from 'src/stores/local_config.js'
import { defaultState as configDefaultState } from 'src/modules/default_config_state' import { defaultState as configDefaultState } from 'src/modules/default_config_state'
@ -689,10 +690,11 @@ export const useSyncConfigStore = defineStore('sync_config', {
getters: { getters: {
mergedConfig: (state) => { mergedConfig: (state) => {
const instancePrefs = useInstanceStore().prefsStorage const instancePrefs = useInstanceStore().prefsStorage
const localPrefs = useLocalConfigStore().prefsStorage
const result = Object.fromEntries( const result = Object.fromEntries(
Object.entries(state.prefsStorage.simple).map(([k, v]) => [ Object.entries(state.prefsStorage.simple).map(([k, v]) => [
k, k,
v ?? instancePrefs[k], localPrefs[k] ?? v ?? instancePrefs[k],
]), ]),
) )
return result return result