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

Merge pull request #4571 from cpradio/hide-about-me-suspended 

FEATURE: Hide Profile Text from non-staff if user is suspended
This commit is contained in:
Régis Hanol 2016-11-28 10:08:57 +01:00 committed by GitHub
parent 3406f7ff6a eb5a5e3a53
commit ecebc58780
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/controllers/user.js.es6
View File

@ -25,6 +25,11 @@ export default Ember.Controller.extend(CanCheckEmails, {
return (!indexStream || viewingSelf) && !forceExpand; return (!indexStream || viewingSelf) && !forceExpand;
}, },
@computed('model.isSuspended', 'currentUser.staff')
isNotSuspendedOrIsStaff(isSuspended, isStaff) {
return !isSuspended || isStaff;
},
linkWebsite: Em.computed.not('model.isBasic'), linkWebsite: Em.computed.not('model.isBasic'),
@computed("model.trust_level") @computed("model.trust_level")

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

@ -86,7 +86,9 @@
<b>{{i18n 'user.suspended_reason'}}</b> {{model.suspend_reason}} <b>{{i18n 'user.suspended_reason'}}</b> {{model.suspend_reason}}
</div> </div>
{{/if}} {{/if}}
{{{model.bio_cooked}}} {{#if isNotSuspendedOrIsStaff}}
{{{model.bio_cooked}}}
{{/if}}
</div> </div>
{{#if publicUserFields}} {{#if publicUserFields}}