github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 00:32:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Link to automatic group page on user admin page.

Browse Source
This commit is contained in:
Guo Xiang Tan
2018-04-13 10:41:29 +08:00
parent 00f59f648d
commit e43baafa02
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/admin/controllers/admin-user-index.js.es6
View File

@ -24,9 +24,13 @@ export default Ember.Controller.extend(CanCheckEmails, {
'model.can_disable_second_factor' 'model.can_disable_second_factor'
), ),
automaticGroups: function() { @computed("model.automaticGroups")
return this.get("model.automaticGroups").map((g) => g.name).join(", "); automaticGroups(automaticGroups) {
}.property("model.automaticGroups"), return automaticGroups.map(group => {
const name = Ember.String.htmlSafe(group.name);
return `<a href="/groups/${name}">${name}</a>`;
}).join(", ");
},
userFields: function() { userFields: function() {
const siteUserFields = this.site.get('user_fields'), const siteUserFields = this.site.get('user_fields'),

2
app/assets/javascripts/admin/templates/user-index.hbs
View File

@ -415,7 +415,7 @@
<h1>{{i18n 'admin.groups.title'}}</h1> <h1>{{i18n 'admin.groups.title'}}</h1>
<div class='display-row'> <div class='display-row'>
<div class='field'>{{i18n 'admin.groups.automatic'}}</div> <div class='field'>{{i18n 'admin.groups.automatic'}}</div>
<div class='value'>{{automaticGroups}}</div> <div class='value'>{{{automaticGroups}}}</div>
</div> </div>
<div class='display-row'> <div class='display-row'>
<div class='field'>{{i18n 'admin.groups.custom'}}</div> <div class='field'>{{i18n 'admin.groups.custom'}}</div>