From 234956234bbb83082759cd1807068b51d7729ae0 Mon Sep 17 00:00:00 2001 From: riking Date: Mon, 25 Aug 2014 12:48:31 -0700 Subject: [PATCH] Fix badge type ordering --- .../javascripts/discourse/controllers/user-badges.js.es6 | 2 +- app/serializers/badge_type_serializer.rb | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/user-badges.js.es6 b/app/assets/javascripts/discourse/controllers/user-badges.js.es6 index ca4887d09b..95cb31236b 100644 --- a/app/assets/javascripts/discourse/controllers/user-badges.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-badges.js.es6 @@ -1,3 +1,3 @@ export default Ember.ArrayController.extend({ - sortProperties: ['grouping_position', 'badge.badgeType.id', 'badge.name', 'badge.id'] + sortProperties: ['grouping_position', 'badge.badge_type.sort_order', 'badge.name', 'badge.id'] }); diff --git a/app/serializers/badge_type_serializer.rb b/app/serializers/badge_type_serializer.rb index 199c99a377..278315a284 100644 --- a/app/serializers/badge_type_serializer.rb +++ b/app/serializers/badge_type_serializer.rb @@ -1,3 +1,9 @@ class BadgeTypeSerializer < ApplicationSerializer - attributes :id, :name + attributes :id, :name, :sort_order + + # change this if/when we allow custom badge types + # correct for now, though + def sort_order + 10 - object.id + end end