codeninjasllc/discourse
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIX: broken admin user page when must_approve_users is enabled

Browse source
This commit is contained in:
Neil Lalonde 2014-03-24 11:43:06 -04:00
parent e823558742
commit 36cbd0d348
2 changed files with 10 additions and 5 deletions
app/assets/javascripts/admin
models
admin_user.js
templates
user_index.js.handlebars

10
app/assets/javascripts/admin/models/admin_user.js
View file

@ -359,9 +359,15 @@ Discourse.AdminUser = Discourse.User.extend({
suspendedBy: function() { suspendedBy: function() {
if (this.get('suspended_by')) { if (this.get('suspended_by')) {
return Discourse.User.create(this.get('suspended_by')); return Discourse.AdminUser.create(this.get('suspended_by'));
} }
}.property('suspended_by') }.property('suspended_by'),
approvedBy: function() {
if (this.get('approved_by')) {
return Discourse.AdminUser.create(this.get('approved_by'));
}
}.property('approved_by')
}); });

5
app/assets/javascripts/admin/templates/user_index.js.handlebars
View file

@ -102,8 +102,8 @@
{{#if approved}} {{#if approved}}
{{i18n admin.user.approved_by}} {{i18n admin.user.approved_by}}
{{#link-to 'adminUser' approved_by}}{{avatar approved_by imageSize="small"}}{{/link-to}} {{#link-to 'adminUser' approvedBy}}{{avatar approvedBy imageSize="small"}}{{/link-to}}
{{#link-to 'adminUser' approved_by}}{{approved_by.username}}{{/link-to}} {{#link-to 'adminUser' approvedBy}}{{approvedBy.username}}{{/link-to}}
{{else}} {{else}}
{{i18n no_value}} {{i18n no_value}}
{{/if}} {{/if}}
@ -260,7 +260,6 @@
<div class='display-row highlight-danger'> <div class='display-row highlight-danger'>
<div class='field'>{{i18n admin.user.suspended_by}}</div> <div class='field'>{{i18n admin.user.suspended_by}}</div>
<div class='value'> <div class='value'>
<!-- TODO: Why don't these links work? -->
{{#link-to 'adminUser' suspendedBy}}{{avatar suspendedBy imageSize="tiny"}}{{/link-to}} {{#link-to 'adminUser' suspendedBy}}{{avatar suspendedBy imageSize="tiny"}}{{/link-to}}
{{#link-to 'adminUser' suspendedBy}}{{suspendedBy.username}}{{/link-to}} {{#link-to 'adminUser' suspendedBy}}{{suspendedBy.username}}{{/link-to}}
</div> </div>