Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 23:25:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: no new badges could be created

Browse Source
This commit is contained in:
Sam 2014-07-25 15:48:43 +10:00
parent 1297243759
commit ae686e8188
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/controllers/admin_badges_controller.js
View File

@ -127,7 +127,7 @@ Discourse.AdminBadgesController = Ember.ArrayController.extend({
'enabled', 'show_posts', 'enabled', 'show_posts',
'target_posts', 'name', 'description', 'target_posts', 'name', 'description',
'icon', 'query', 'badge_grouping_id', 'icon', 'query', 'badge_grouping_id',
'trigger']; 'trigger', 'badge_type_id'];
if(this.get('selectedItem.system')){ if(this.get('selectedItem.system')){
var protectedFields = this.get('protectedSystemFields'); var protectedFields = this.get('protectedSystemFields');

4
app/assets/javascripts/discourse/models/badge.js
View File

@ -141,6 +141,10 @@ Discourse.Badge = Discourse.Model.extend({
self.set('savingStatus', I18n.t('saved')); self.set('savingStatus', I18n.t('saved'));
self.set('saving', false); self.set('saving', false);
return self; return self;
}, function(error){
self.set('savingStatus', '');
self.set('saving', false);
bootbox.alert(error.responseText);
}); });
}, },