IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: don't shown the 'staff-counters' div when there's no counter

Browse Source
This commit is contained in:
Régis Hanol
2017-12-16 13:16:23 +01:00
parent 50487d6122
commit 8175740e87
2 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,14 @@ export default Ember.Controller.extend(CanCheckEmails, {
return (!indexStream || viewingSelf) && !forceExpand;
},
hasGivenFlags: Ember.computed.gt('model.number_of_flags_given', 0),
hasFlaggedPosts: Ember.computed.gt('model.number_of_flagged_posts', 0),
hasDeletedPosts: Ember.computed.gt('model.number_of_deleted_posts', 0),
hasBeenSuspended: Ember.computed.gt('model.number_of_suspensions', 0),
hasReceivedWarnings: Ember.computed.gt('model.warnings_received_count', 0),
showStaffCounters: Ember.computed.or('hasGivenFlags', 'hasFlaggedPosts', 'hasDeletedPosts', 'hasBeenSuspended', 'hasReceivedWarnings'),
@computed('model.isSuspended', 'currentUser.staff')
isNotSuspendedOrIsStaff(isSuspended, isStaff) {
return !isSuspended || isStaff;

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

@@ -3,31 +3,33 @@
<section class="{{if collapsedInfo 'collapsed-info'}} about {{if hasProfileBackground 'has-background' 'no-background'}}" style={{model.profileBackground}}>
{{#unless collapsedInfo}}
<div class='staff-counters'>
{{#if model.number_of_flags_given}}
<div><span class="helpful-flags">{{model.number_of_flags_given}}</span>{{i18n 'user.staff_counters.flags_given'}}</div>
{{/if}}
{{#if model.number_of_flagged_posts}}
<div>
{{#link-to 'user.flaggedPosts' model}}
<span class="flagged-posts">{{model.number_of_flagged_posts}}</span>{{i18n 'user.staff_counters.flagged_posts'}}
{{/link-to}}
{{#if showStaffCounters}}
<div class='staff-counters'>
{{#if model.number_of_flags_given}}
<div><span class="helpful-flags">{{model.number_of_flags_given}}</span>{{i18n 'user.staff_counters.flags_given'}}</div>
{{/if}}
{{#if model.number_of_flagged_posts}}
<div>
{{#link-to 'user.flaggedPosts' model}}
<span class="flagged-posts">{{model.number_of_flagged_posts}}</span>{{i18n 'user.staff_counters.flagged_posts'}}
{{/link-to}}
</div>
{{/if}}
{{#if model.number_of_deleted_posts}}
<div>
{{#link-to 'user.deletedPosts' model}}
<span class="deleted-posts">{{model.number_of_deleted_posts}}</span>{{i18n 'user.staff_counters.deleted_posts'}}
{{/link-to}}
</div>
{{/if}}
{{#if model.number_of_suspensions}}
<div><span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}</div>
{{/if}}
{{#if model.warnings_received_count}}
<div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n 'user.staff_counters.warnings_received'}}</div>
{{/if}}
</div>
{{/if}}
{{#if model.number_of_deleted_posts}}
<div>
{{#link-to 'user.deletedPosts' model}}
<span class="deleted-posts">{{model.number_of_deleted_posts}}</span>{{i18n 'user.staff_counters.deleted_posts'}}
{{/link-to}}
</div>
{{/if}}
{{#if model.number_of_suspensions}}
<div><span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}</div>
{{/if}}
{{#if model.warnings_received_count}}
<div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n 'user.staff_counters.warnings_received'}}</div>
{{/if}}
</div>
{{/unless}}
<div class='profile-image'></div>