FEATURE: allow admins to enter badge long descriptions

FIX: fallback to description if badge long description is missing

Also moves all badge localization into server.en, this slims the client down

serializers pass down localized names/descriptions/long descriptions
This commit is contained in:
Sam
2016-03-28 18:38:57 +11:00
parent 94f831f7e7
commit fe51f84aa7
20 changed files with 284 additions and 283 deletions
@@ -14,7 +14,6 @@ export default Ember.Controller.extend(BufferedContent, {
readOnly: Ember.computed.alias('buffered.system'),
showDisplayName: propertyNotEqual('name', 'displayName'),
canEditDescription: Em.computed.none('buffered.translatedDescription'),
hasQuery: function() {
const bQuery = this.get('buffered.query');
@@ -37,6 +36,7 @@ export default Ember.Controller.extend(BufferedContent, {
'listable', 'auto_revoke',
'enabled', 'show_posts',
'target_posts', 'name', 'description',
'long_description',
'icon', 'image', 'query', 'badge_grouping_id',
'trigger', 'badge_type_id'],
self = this;
@@ -61,7 +61,7 @@ export default Ember.ArrayController.extend({
}
});
return _.sortBy(badges, badge => badge.get('displayName'));
return _.sortBy(badges, badge => badge.get('name'));
}.property('badges.@each', 'model.@each'),
/**