mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
The isSilenced and isSuspended aliases were useless
We already had `silenced` and `suspended` on the model with the same effect!
This commit is contained in:
@@ -240,8 +240,6 @@ const AdminUser = Discourse.User.extend({
|
||||
return this.get('trust_level') < 4;
|
||||
}.property('trust_level'),
|
||||
|
||||
isSuspended: Em.computed.equal('suspended', true),
|
||||
isSilenced: Ember.computed.equal('silenced', true),
|
||||
canSuspend: Em.computed.not('staff'),
|
||||
|
||||
suspendDuration: function() {
|
||||
|
||||
@@ -318,18 +318,18 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="user-suspended display-row {{if model.isSuspended 'highlight-danger'}}">
|
||||
<div class='field'>{{i18n 'admin.user.suspended'}}</div>
|
||||
<div class='value'>
|
||||
{{i18n-yes-no model.isSuspended}}
|
||||
{{#if model.isSuspended}}
|
||||
{{#unless model.suspendedForever}}
|
||||
{{i18n "admin.user.suspended_until" until=model.suspendedTillDate}}
|
||||
{{/unless}}
|
||||
{{/if}}
|
||||
</div>
|
||||
<div class='controls'>
|
||||
{{#if model.isSuspended}}
|
||||
<div class="user-suspended display-row {{if model.suspended 'highlight-danger'}}">
|
||||
<div class='field'>{{i18n 'admin.user.suspended'}}</div>
|
||||
<div class='value'>
|
||||
{{i18n-yes-no model.suspended}}
|
||||
{{#if model.suspended}}
|
||||
{{#unless model.suspendedForever}}
|
||||
{{i18n "admin.user.suspended_until" until=model.suspendedTillDate}}
|
||||
{{/unless}}
|
||||
{{/if}}
|
||||
</div>
|
||||
<div class='controls'>
|
||||
{{#if model.suspended}}
|
||||
{{d-button
|
||||
class="btn-danger unsuspend-user"
|
||||
action=(action "unsuspend")
|
||||
@@ -349,7 +349,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{#if model.isSuspended}}
|
||||
{{#if model.suspended}}
|
||||
<div class='display-row highlight-danger suspension-info'>
|
||||
<div class='field'>{{i18n 'admin.user.suspended_by'}}</div>
|
||||
<div class='value'>
|
||||
@@ -367,7 +367,7 @@
|
||||
<div class='field'>{{i18n 'admin.user.silenced'}}</div>
|
||||
<div class='value'>
|
||||
{{i18n-yes-no model.silenced}}
|
||||
{{#if model.isSilenced}}
|
||||
{{#if model.silenced}}
|
||||
{{#unless model.silencedForever}}
|
||||
{{i18n "admin.user.suspended_until" until=model.silencedTillDate}}
|
||||
{{/unless}}
|
||||
@@ -394,7 +394,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{#if model.isSilenced}}
|
||||
{{#if model.silenced}}
|
||||
<div class='display-row highlight-danger silence-info'>
|
||||
<div class='field'>{{i18n 'admin.user.silenced_by'}}</div>
|
||||
<div class='value'>
|
||||
@@ -408,6 +408,7 @@
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
|
||||
</section>
|
||||
|
||||
{{#if currentUser.admin}}
|
||||
|
||||
Reference in New Issue
Block a user