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 #3206 from edgibbs/sort_admin_user_badges_by_name 

FIX: Default sort grantable badges by name
This commit is contained in:
Sam 2015-02-17 12:18:15 +11:00
parent d56b71851b c50205725f
commit a7d08172c8
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
View File

@ -32,7 +32,7 @@ export default Ember.ArrayController.extend({
}
});
return badges;
return _.sortBy(badges, "name");
}.property('badges.@each', 'model.@each'),
/**

16
test/javascripts/admin/controllers/admin-user-badges-test.js.es6 Normal file
View File

@ -0,0 +1,16 @@
moduleFor('controller:admin-user-badges', 'Admin User Badges Controller', {
needs: ['controller:adminUser']
});
test("grantableBadges", function() {
var badge_first = Discourse.Badge.create({id: 3, name: "A Badge"});
var badge_middle = Discourse.Badge.create({id: 1, name: "My Badge"});
var badge_last = Discourse.Badge.create({id: 2, name: "Zoo Badge"});
var controller = this.subject({ badges: [badge_last, badge_first, badge_middle] });
var sorted_names = [badge_first.name, badge_middle.name, badge_last.name];
var badge_names = controller.get('grantableBadges').map(function(badge) {
return badge.name;
});
deepEqual(badge_names, sorted_names, "sorts badges by name");
});