Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/polls.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordartcafe <github@dartcafe.de>2020-08-28 08:35:06 +0300
committerdartcafe <github@dartcafe.de>2020-08-31 09:17:13 +0300
commitdbb36a3ab3128b4c5bdfa025048c1aacf3a5a39d (patch)
tree4f83345bf712dcc27bd8a1070ea5778195b9d910 /src
parent483319264c6f9d7299cea4f7a0cdf9edcb3d739e (diff)
improvements
Diffstat (limited to 'src')
-rw-r--r--src/js/components/Navigation/Navigation.vue8
-rw-r--r--src/js/store/modules/settings.js4
2 files changed, 8 insertions, 4 deletions
diff --git a/src/js/components/Navigation/Navigation.vue b/src/js/components/Navigation/Navigation.vue
index cbd59175..83c2048b 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]
+ })
},
}