Fix badge type ordering

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']
 });

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