diff --git a/app/assets/javascripts/discourse/controllers/user-expansion.js.es6 b/app/assets/javascripts/discourse/controllers/user-expansion.js.es6 index 1f5dbade0c8..a2058d93562 100644 --- a/app/assets/javascripts/discourse/controllers/user-expansion.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-expansion.js.es6 @@ -18,6 +18,8 @@ export default ObjectController.extend({ hasUserFilters: Em.computed.gt('postStream.userFilters.length', 0), + isSuspended: Em.computed.notEmpty('user.suspend_reason'), + showBadges: Discourse.computed.setting('enable_badges'), moreBadgesCount: function() { diff --git a/app/assets/javascripts/discourse/templates/user-expansion.js.handlebars b/app/assets/javascripts/discourse/templates/user-expansion.js.handlebars index 6ee7e07ab94..4ff21636b29 100644 --- a/app/assets/javascripts/discourse/templates/user-expansion.js.handlebars +++ b/app/assets/javascripts/discourse/templates/user-expansion.js.handlebars @@ -32,7 +32,15 @@
- {{#if user.bio_cooked}}
{{{user.bio_cooked}}}
{{/if}} + {{#if isSuspended}} +
+ + {{i18n user.suspended_notice date="user.suspendedTillDate"}}
+ {{i18n user.suspended_reason}} {{user.suspend_reason}} +
+ {{else}} + {{#if user.bio_cooked}}
{{{user.bio_cooked}}}
{{/if}} + {{/if}} {{#if user.can_send_private_message_to_user}} @@ -47,7 +55,6 @@ {{#if hasUserFilters}} {{/if}} -
{{else}}

{{i18n loading}}