From 3ef55f3b1702421c15c552df91a8bd694c3e53b4 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Thu, 5 Sep 2013 20:09:39 +0200 Subject: [PATCH] Hopfully fix #1434 by updating selectors first. Same fix as #1431 but now for update Conflicts: app/controllers/recurring_todos_controller.rb --- app/controllers/recurring_todos_controller.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/controllers/recurring_todos_controller.rb b/app/controllers/recurring_todos_controller.rb index 0dd786f8..31f158d8 100644 --- a/app/controllers/recurring_todos_controller.rb +++ b/app/controllers/recurring_todos_controller.rb @@ -89,6 +89,15 @@ class RecurringTodosController < ApplicationController params["recurring_todo"]["weekly_return_"+day]=' ' if params["recurring_todo"]["weekly_return_"+day].nil? end + selector_attributes = { + 'recurring_period' => recurring_todo_params['recurring_period'], + 'daily_selector' => recurring_todo_params['daily_selector'], + 'monthly_selector' => recurring_todo_params['monthly_selector'], + 'yearly_selector' => recurring_todo_params['yearly_selector'] + } + + @recurring_todo.assign_attributes(:recurring_period => recurring_todo_params[:recurring_period]) + @recurring_todo.assign_attributes(selector_attributes) @saved = @recurring_todo.update_attributes recurring_todo_params respond_to do |format|