diff --git a/app/assets/javascripts/admin/templates/badges.js.handlebars b/app/assets/javascripts/admin/templates/badges.js.handlebars index 782fb6c9d2e..1f27dc71675 100644 --- a/app/assets/javascripts/admin/templates/badges.js.handlebars +++ b/app/assets/javascripts/admin/templates/badges.js.handlebars @@ -102,7 +102,7 @@
- {{input type="checkbox" checked=allow_title disabled=readOnly}} + {{input type="checkbox" checked=allow_title}} {{i18n admin.badges.allow_title}}
diff --git a/app/models/badge.rb b/app/models/badge.rb index be5cd30cfa0..6587ed04596 100644 --- a/app/models/badge.rb +++ b/app/models/badge.rb @@ -213,6 +213,10 @@ SQL self.name ||= val end + def default_allow_title=(val) + self.allow_title ||= val + end + def default_badge_grouping_id=(val) # allow to correct orphans if !self.badge_grouping_id || self.badge_grouping_id < 0 diff --git a/db/fixtures/006_badges.rb b/db/fixtures/006_badges.rb index 6fa5f5a6d03..9fe42edb215 100644 --- a/db/fixtures/006_badges.rb +++ b/db/fixtures/006_badges.rb @@ -55,7 +55,7 @@ trust_level_badges.each do |spec| b.trigger = Badge::Trigger::TrustLevelChange # allow title for leader and elder - b.allow_title = spec[:id] > 2 + b.default_allow_title = spec[:id] > 2 end end