From 4644841ba67e1e1f606011b51148303f59be3960 Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Fri, 25 May 2018 14:57:51 +0200 Subject: Do not show count on empty groups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- settings/src/views/Users.vue | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'settings/src') diff --git a/settings/src/views/Users.vue b/settings/src/views/Users.vue index da52efe4a60..17fe1bb9a56 100644 --- a/settings/src/views/Users.vue +++ b/settings/src/views/Users.vue @@ -234,12 +234,21 @@ export default { let item = {}; item.id = group.id.replace(' ', '_'); item.key = item.id; - item.router = { // router link to + item.utils = {} + + // router link to + item.router = { name: 'group', params: {selectedGroup: group.id} }; - item.text = group.name; // group name - item.utils = {counter: group.usercount - group.disabled}; // users count + + // group name + item.text = group.name; + + // users count + if (group.usercount - group.disabled > 0) { + item.utils.counter = group.usercount - group.disabled; + } if (item.id !== 'admin' && item.id !== 'disabled' && this.settings.isAdmin) { // add delete button on real groups @@ -268,13 +277,17 @@ export default { } // Add everyone group - groups.unshift({ + let everyoneGroup = { id: 'everyone', key: 'everyone', router: {name:'users'}, text: t('settings', 'Everyone'), - utils: {counter: this.userCount} - }); + }; + // users count + if (this.userCount > 0) { + everyoneGroup.utils = {counter: this.userCount}; + } + groups.unshift(everyoneGroup); // Return return { -- cgit v1.2.3