diff options
| author | dartcafe <github@dartcafe.de> | 2020-08-28 08:35:06 +0300 |
|---|---|---|
| committer | dartcafe <github@dartcafe.de> | 2020-08-28 08:35:06 +0300 |
| commit | d3f723d88df85e00aa6da43028e445e8a87f92a4 (patch) | |
| tree | fe3d021fed981e6222f299e2aafec28e1453af94 /src | |
| parent | e8c87231ea0d09da460b5a40176c8f6d14f19349 (diff) | |
improvements
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/components/Navigation/Navigation.vue | 8 | ||||
| -rw-r--r-- | src/js/store/modules/settings.js | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/js/components/Navigation/Navigation.vue b/src/js/components/Navigation/Navigation.vue index bf981602..4b507b9c 100644 --- a/src/js/components/Navigation/Navigation.vue +++ b/src/js/components/Navigation/Navigation.vue @@ -38,9 +38,11 @@ </ul> </AppNavigationItem> </template> - <AppNavigationSettings :title="t('core', 'Settings')"> - <NavigationSettings /> - </AppNavigationSettings> + <template #footer> + <AppNavigationSettings :title="t('core', 'Settings')"> + <NavigationSettings /> + </AppNavigationSettings> + </template> </AppNavigation> </template> diff --git a/src/js/store/modules/settings.js b/src/js/store/modules/settings.js index a9f638ca..406c18bb 100644 --- a/src/js/store/modules/settings.js +++ b/src/js/store/modules/settings.js @@ -44,7 +44,9 @@ const mutations = { }, setPreference(state, payload) { - Object.assign(state.user, payload) + Object.keys(payload).filter(key => key in state.user).forEach(key => { + state.user[key] = payload[key] + }) }, } |