From 93e6889fb28b7784b66cddf659f47e24fb5324e8 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Tue, 25 Feb 2020 19:06:55 +0100
Subject: Fix group navigation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/settings/src/router.js       |  2 +-
 apps/settings/src/views/Users.vue | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'apps/settings')

diff --git a/apps/settings/src/router.js b/apps/settings/src/router.js
index c11c74ac163..d292719d384 100644
--- a/apps/settings/src/router.js
+++ b/apps/settings/src/router.js
@@ -53,7 +53,7 @@ export default new Router({
 			name: 'users',
 			children: [
 				{
-					path: ':selectedGroup(.*)',
+					path: ':selectedGroup',
 					name: 'group',
 					component: Users,
 				},
diff --git a/apps/settings/src/views/Users.vue b/apps/settings/src/views/Users.vue
index b3b60c5e287..336d7bfe931 100644
--- a/apps/settings/src/views/Users.vue
+++ b/apps/settings/src/views/Users.vue
@@ -49,10 +49,11 @@
 					</AppNavigationCounter>
 				</AppNavigationItem>
 				<AppNavigationItem
+					v-if="settings.isAdmin"
 					id="admin"
 					:exact="true"
 					:title="t('settings', 'Admins')"
-					:to="{ name: 'users', params: { selectedGroup: 'admin' } }"
+					:to="{ name: 'group', params: { selectedGroup: 'admin' } }"
 					icon="icon-user-admin">
 					<AppNavigationCounter v-if="adminGroupMenu.count" slot="counter">
 						{{ adminGroupMenu.count }}
@@ -65,7 +66,7 @@
 					id="disabled"
 					:exact="true"
 					:title="t('settings', 'Disabled users')"
-					:to="{ name: 'users', params: { selectedGroup: 'disabled' } }"
+					:to="{ name: 'group', params: { selectedGroup: 'disabled' } }"
 					icon="icon-disabled-users">
 					<AppNavigationCounter v-if="disabledGroupMenu.usercount > 0" slot="counter">
 						{{ disabledGroupMenu.usercount }}
@@ -78,7 +79,7 @@
 					:key="group.id"
 					:exact="true"
 					:title="group.title"
-					:to="{ name: 'users', params: { selectedGroup: group.id } }">
+					:to="{ name: 'group', params: { selectedGroup: group.id } }">
 					<AppNavigationCounter v-if="group.count" slot="counter">
 						{{ group.count }}
 					</AppNavigationCounter>
@@ -489,6 +490,10 @@ export default {
 		 */
 		formatGroupMenu(group) {
 			const item = {}
+			if (typeof group === 'undefined') {
+				return {}
+			}
+
 			item.id = group.id
 			item.title = group.name
 			item.usercount = group.usercount
-- 
cgit v1.2.3