summaryrefslogtreecommitdiffstats
path: root/settings/src
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-05-24 16:06:15 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-05-24 17:52:16 +0200
commita093a67b5a1dbe1826b86543bf29b3522f8d79c6 (patch)
tree85c473f5511a48b887f2645a908dba70fe107e71 /settings/src
parentcd73cd3a6e2c3623efbd274ceacc44c2d210b049 (diff)
downloadnextcloud-server-a093a67b5a1dbe1826b86543bf29b3522f8d79c6.tar.gz
nextcloud-server-a093a67b5a1dbe1826b86543bf29b3522f8d79c6.zip
Fixed app navigation order
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings/src')
-rw-r--r--settings/src/components/appNavigation.vue2
-rw-r--r--settings/src/views/Users.vue2
2 files changed, 3 insertions, 1 deletions
diff --git a/settings/src/components/appNavigation.vue b/settings/src/components/appNavigation.vue
index 02858b4bb5b..a3ae2620a97 100644
--- a/settings/src/components/appNavigation.vue
+++ b/settings/src/components/appNavigation.vue
@@ -4,7 +4,7 @@
<button type="button" :id="menu.new.id" :class="menu.new.icon" @click="menu.new.action">{{menu.new.text}}</button>
</div>
<ul :id="menu.id">
- <navigation-item v-for="(item, key) in menu.items" :item="item" :key="key" />
+ <navigation-item v-for="item in menu.items" :item="item" :key="item.key" />
</ul>
<div id="app-settings">
<div id="app-settings-header">
diff --git a/settings/src/views/Users.vue b/settings/src/views/Users.vue
index d7b55033c77..da52efe4a60 100644
--- a/settings/src/views/Users.vue
+++ b/settings/src/views/Users.vue
@@ -233,6 +233,7 @@ export default {
groups = groups.map(group => {
let item = {};
item.id = group.id.replace(' ', '_');
+ item.key = item.id;
item.router = { // router link to
name: 'group',
params: {selectedGroup: group.id}
@@ -269,6 +270,7 @@ export default {
// Add everyone group
groups.unshift({
id: 'everyone',
+ key: 'everyone',
router: {name:'users'},
text: t('settings', 'Everyone'),
utils: {counter: this.userCount}