Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Respect sort order when user fields are shown publically

This commit is contained in:
Robin Ward 2015-09-21 15:25:44 -04:00
parent cc0f76e60a
commit b6155889d5
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/controllers/user.js.es6
View File

@ -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'),