From e68ecf1f1d6b8a79e29c9624cb7ea1c3765ba053 Mon Sep 17 00:00:00 2001 From: Bianca Nenciu Date: Fri, 12 Oct 2018 02:34:47 +0300 Subject: [PATCH] UX: Add link to Groups in admin dashboard. (#6480) * UX: Add link to Groups in admin dashboard. * UX: Site settings have immediate effect. --- app/assets/javascripts/admin/controllers/admin.js.es6 | 11 ++++++++--- app/assets/javascripts/admin/templates/admin.hbs | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/admin.js.es6 b/app/assets/javascripts/admin/controllers/admin.js.es6 index b17b4e86c12..afc8b7c46b3 100644 --- a/app/assets/javascripts/admin/controllers/admin.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin.js.es6 @@ -3,9 +3,14 @@ import computed from "ember-addons/ember-computed-decorators"; export default Ember.Controller.extend({ application: Ember.inject.controller(), - @computed - showBadges() { - return this.currentUser.get("admin") && this.siteSettings.enable_badges; + @computed("siteSettings.enable_group_directory") + showGroups(enableGroupDirectory) { + return !enableGroupDirectory; + }, + + @computed("siteSettings.enable_badges") + showBadges(enableBadges) { + return this.currentUser.get("admin") && enableBadges; }, @computed("application.currentPath") diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs index 495a51cf460..415239a6565 100644 --- a/app/assets/javascripts/admin/templates/admin.hbs +++ b/app/assets/javascripts/admin/templates/admin.hbs @@ -10,6 +10,9 @@ {{nav-item route='adminSiteSettings' label='admin.site_settings.title'}} {{/if}} {{nav-item route='adminUsersList' label='admin.users.title'}} + {{#if showGroups}} + {{nav-item route='groups' label='admin.groups.title'}} + {{/if}} {{#if showBadges}} {{nav-item route='adminBadges' label='admin.badges.title'}} {{/if}}