From b6155889d52cac5a79dc4ada37602b2b88d3e723 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 21 Sep 2015 15:25:44 -0400 Subject: [PATCH] FIX: Respect sort order when user fields are shown publically --- .../javascripts/discourse/controllers/user.js.es6 | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6 index 83c7c4ec99a..7390995fd4b 100644 --- a/app/assets/javascripts/discourse/controllers/user.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user.js.es6 @@ -48,16 +48,12 @@ export default Ember.Controller.extend(CanCheckEmails, { }.property('model.can_be_deleted', 'model.can_delete_all_posts'), publicUserFields: function() { - var siteUserFields = this.site.get('user_fields'); + const siteUserFields = this.site.get('user_fields'); if (!Ember.isEmpty(siteUserFields)) { - var userFields = this.get('model.user_fields'); - return siteUserFields.filterProperty('show_on_profile', true).sortBy('id').map(function(uf) { - var val = userFields ? userFields[uf.get('id').toString()] : null; - if (Ember.isEmpty(val)) { - return null; - } else { - return Ember.Object.create({value: val, field: uf}); - } + const userFields = this.get('model.user_fields'); + return siteUserFields.filterProperty('show_on_profile', true).sortBy('position').map(field => { + const value = userFields ? userFields[field.get('id').toString()] : null; + return Ember.isEmpty(value) ? null : Ember.Object.create({ value, field }); }).compact(); } }.property('model.user_fields.@each.value'),