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

UX: Don't display span if there is no count.

This commit is contained in:
Guo Xiang Tan 2016-02-19 15:32:10 +08:00
parent 665a87a32f
commit 5e329898f6
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/templates/groups_type.hbs
View File

@ -4,7 +4,11 @@
<ul> <ul>
{{#each group in controller}} {{#each group in controller}}
<li> <li>
{{#link-to "adminGroup" group.type group.name}}{{group.name}} <span class="count">{{group.userCountDisplay}}</span>{{/link-to}} {{#link-to "adminGroup" group.type group.name}}{{group.name}}
{{#if group.userCountDisplay}}
<span class="count">{{group.userCountDisplay}}</span>
{{/if}}
{{/link-to}}
</li> </li>
{{/each}} {{/each}}
</ul> </ul>

8
app/assets/javascripts/discourse/models/group.js.es6
View File

@ -17,11 +17,11 @@ const Group = Discourse.Model.extend({
return this.get("automatic") ? "automatic" : "custom"; return this.get("automatic") ? "automatic" : "custom";
}.property("automatic"), }.property("automatic"),
userCountDisplay: function(){ @computed('user_count')
var c = this.get('user_count'); userCountDisplay(userCount) {
// don't display zero its ugly // don't display zero its ugly
if (c > 0) { return c; } if (userCount > 0) { return userCount; }
}.property('user_count'), },
findMembers() { findMembers() {
if (Em.isEmpty(this.get('name'))) { return ; } if (Em.isEmpty(this.get('name'))) { return ; }