diff --git a/.fabmanager-version b/.fabmanager-version index a6c4b4a24..e393c3c55 100644 --- a/.fabmanager-version +++ b/.fabmanager-version @@ -1 +1 @@ -2.4.10 \ No newline at end of file +2.4.11 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c5482390..9866cc9e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog Fab Manager +## v2.4.11 2017 March 15 +- Fix a bug: editing and saving a plan, result in removing the rolling attribute +- [TODO DEPLOY] `rake fablab:fix:rolling_plans` + ## v2.4.10 2017 January 9 - Optimized notifications system diff --git a/app/assets/javascripts/controllers/admin/plans.coffee.erb b/app/assets/javascripts/controllers/admin/plans.coffee.erb index c632790b8..31b722d60 100644 --- a/app/assets/javascripts/controllers/admin/plans.coffee.erb +++ b/app/assets/javascripts/controllers/admin/plans.coffee.erb @@ -107,7 +107,7 @@ Application.Controllers.controller 'NewPlanController', ['$scope', '$uibModal', interval: null intervalCount: 0 amount: null - isRolling: false + is_rolling: false partnerId: null partnerContact: null ui_weight: 0 diff --git a/app/assets/templates/admin/plans/_form.html.erb b/app/assets/templates/admin/plans/_form.html.erb index f68eced4c..5026b187e 100644 --- a/app/assets/templates/admin/plans/_form.html.erb +++ b/app/assets/templates/admin/plans/_form.html.erb @@ -99,7 +99,7 @@
{{ (plan.is_rolling ? 'yes' : 'no') | translate }} - + {{ 'a_rolling_subscription_will_begin_the_day_of_the_first_training' | translate }} {{ 'otherwise_it_will_begin_as_soon_as_it_is_bought' | translate }} diff --git a/lib/tasks/fablab/fix.rake b/lib/tasks/fablab/fix.rake index f230f2d47..f936d8e1a 100644 --- a/lib/tasks/fablab/fix.rake +++ b/lib/tasks/fablab/fix.rake @@ -16,5 +16,14 @@ namespace :fablab do e.save! end end + + task rolling_plans: :environment do + Plan.where(is_rolling: nil).each do |p| + if p.is_rolling.nil? and p.is_rolling != false + p.is_rolling = true + p.save! + end + end + end end end