mirror of
https://github.com/discourse/discourse.git
synced 2026-08-04 10:23:17 -05:00
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:
@@ -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'),
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user