github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-26 17:14:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: sane badge ordering on user page

Browse Source
This commit is contained in:
Sam 2014-12-22 14:30:37 +11:00
parent 27d43ad6c0
commit a75b9db4a2
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/discourse/controllers/user-badges.js.es6
View File

@ -1,3 +1,18 @@
export default Ember.ArrayController.extend({ export default Ember.ArrayController.extend({
sortProperties: ['grouping_position', 'badge.badge_type.sort_order', 'badge.name', 'badge.id'] sortProperties: ['badge.badge_type.sort_order', 'badge.name'],
orderBy: function(ub1, ub2){
var sr1 = ub1.get('badge.badge_type.sort_order');
var sr2 = ub2.get('badge.badge_type.sort_order');
if(sr1 > sr2) {
return -1;
}
if(sr2 > sr1) {
return 1;
}
return ub1.get('badge.name') < ub2.get('badge.name') ? -1 : 1;
}
}); });

2
app/assets/javascripts/discourse/templates/user/badges.hbs
View File

@ -1,5 +1,5 @@
<section class='user-content user-badges-list'> <section class='user-content user-badges-list'>
{{#each ub in model}} {{#each ub in controller}}
{{user-badge badge=ub.badge count=ub.count}} {{user-badge badge=ub.badge count=ub.count}}
{{/each}} {{/each}}
</section> </section>