From 4f8542008832da7f9138020c4c92e31963557b42 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 21 Aug 2015 12:47:16 -0400
Subject: [PATCH] FIX: Fields should be ordered by position on preferences page

---
 app/assets/javascripts/discourse/controllers/preferences.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6
index 3a0bd90fe64..dd729eab29d 100644
--- a/app/assets/javascripts/discourse/controllers/preferences.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6
@@ -30,7 +30,7 @@ export default Ember.Controller.extend(CanCheckEmails, {
       if (!this.get('currentUser.staff')) {
         siteUserFields = siteUserFields.filterProperty('editable', true);
       }
-      return siteUserFields.sortBy('field_type').map(function(field) {
+      return siteUserFields.sortBy('position').map(function(field) {
         const value = userFields ? userFields[field.get('id').toString()] : null;
         return Ember.Object.create({ value, field });
       });