From 3e048d686ed2546979511c21c9071cd9c0db635f Mon Sep 17 00:00:00 2001 From: osamasayegh Date: Mon, 17 Apr 2017 21:53:30 +0300 Subject: [PATCH] The "Groups" section's heading on user admin page was visible to mods Since moderators can't manage a user groups, they shouldn't see the Groups heading on the user admin page. ## Before: ![before](https://cloud.githubusercontent.com/assets/17474474/25099135/c0e1d5a4-23b3-11e7-95d1-8036bff057d4.png) ## After: ![after](https://cloud.githubusercontent.com/assets/17474474/25099130/c060a538-23b3-11e7-8428-602fc523e9e8.png) --- .../admin/templates/user-index.hbs | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs index f172c651242..069d47ecb29 100644 --- a/app/assets/javascripts/admin/templates/user-index.hbs +++ b/app/assets/javascripts/admin/templates/user-index.hbs @@ -343,32 +343,31 @@ -
-

{{i18n 'admin.groups.title'}}

- - {{#if currentUser.admin}} -
-
{{i18n 'admin.groups.automatic'}}
-
{{automaticGroups}}
-
-
-
{{i18n 'admin.groups.custom'}}
-
- {{admin-group-selector selected=model.customGroups available=availableGroups}} +{{#if currentUser.admin}} +
+

{{i18n 'admin.groups.title'}}

+
+
{{i18n 'admin.groups.automatic'}}
+
{{automaticGroups}}
-
- {{#if model.customGroups}} - {{i18n 'admin.groups.primary'}} - {{combo-box content=model.customGroups value=model.primary_group_id nameProperty="name" none="admin.groups.no_primary"}} - {{/if}} - {{#if primaryGroupDirty}} - {{d-button icon="check" class="ok" action="savePrimaryGroup"}} - {{d-button icon="times" class="cancel" action="resetPrimaryGroup"}} - {{/if}} +
+
{{i18n 'admin.groups.custom'}}
+
+ {{admin-group-selector selected=model.customGroups available=availableGroups}} +
+
+ {{#if model.customGroups}} + {{i18n 'admin.groups.primary'}} + {{combo-box content=model.customGroups value=model.primary_group_id nameProperty="name" none="admin.groups.no_primary"}} + {{/if}} + {{#if primaryGroupDirty}} + {{d-button icon="check" class="ok" action="savePrimaryGroup"}} + {{d-button icon="times" class="cancel" action="resetPrimaryGroup"}} + {{/if}} +
-
- {{/if}} -
+
+{{/if}}

{{i18n 'admin.user.activity'}}