Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Regression with suspended text

This commit is contained in:
Robin Ward 2015-08-13 17:32:12 -04:00
parent e3cf8b17ba
commit 6db98f52d6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/templates/user_index.hbs → app/assets/javascripts/admin/templates/user-index.hbs
View File

@ -306,12 +306,12 @@
<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'>
{{#link-to 'adminUser' suspendedBy}}{{avatar suspendedBy imageSize="tiny"}}{{/link-to}} {{#link-to 'adminUser' suspendedBy}}{{avatar model.suspendedBy imageSize="tiny"}}{{/link-to}}
{{#link-to 'adminUser' suspendedBy}}{{suspendedBy.username}}{{/link-to}} {{#link-to 'adminUser' suspendedBy}}{{model.suspendedBy.username}}{{/link-to}}
</div> </div>
<div class='controls'> <div class='controls'>
<b>{{i18n 'admin.user.suspend_reason'}}</b>: <b>{{i18n 'admin.user.suspend_reason'}}</b>:
{{suspend_reason}} {{model.suspend_reason}}
</div> </div>
</div> </div>
{{/if}} {{/if}}

4
app/assets/javascripts/discourse/templates/user/user.hbs
View File

@ -77,8 +77,8 @@
{{#if model.isSuspended}} {{#if model.isSuspended}}
<div class='suspended'> <div class='suspended'>
{{fa-icon "ban"}} {{fa-icon "ban"}}
<b>{{i18n 'user.suspended_notice' date=suspendedTillDate}}</b><br/> <b>{{i18n 'user.suspended_notice' date=model.suspendedTillDate}}</b><br/>
<b>{{i18n 'user.suspended_reason'}}</b> {{suspend_reason}} <b>{{i18n 'user.suspended_reason'}}</b> {{model.suspend_reason}}
</div> </div>
{{/if}} {{/if}}
{{{model.bio_cooked}}} {{{model.bio_cooked}}}