@@ -11,16 +11,18 @@ if @saved page['tickler-empty-nd'].show if source_view_is(:deferred) && @down_count == 0 # show new todo if the completed todo was recurring - unless @new_recurring_todo.nil? || @new_recurring_todo.deferred? - page.call "todoItems.ensureVisibleWithEffectAppear", item_container_id(@new_recurring_todo) - page.insert_html :bottom, item_container_id(@new_recurring_todo), :partial => 'todos/todo', :locals => { :todo => @new_recurring_todo, :parent_container_type => parent_container_type } - page.visual_effect :highlight, dom_id(@new_recurring_todo, 'line'), {'startcolor' => "'#99ff99'"} - page.notify :notice, "Action was deleted. Because this action is recurring, a new action was added", 6.0 - else - if @todo.recurring_todo.todos.active.count == 0 - page.notify :notice, "There is no next action after the recurring action you just deleted. The recurrence is completed", 6.0 unless @recurring_todo.nil? + if @todo.from_recurring_todo? + unless @new_recurring_todo.nil? || @new_recurring_todo.deferred? + page.call "todoItems.ensureVisibleWithEffectAppear", item_container_id(@new_recurring_todo) + page.insert_html :bottom, item_container_id(@new_recurring_todo), :partial => 'todos/todo', :locals => { :todo => @new_recurring_todo, :parent_container_type => parent_container_type } + page.visual_effect :highlight, dom_id(@new_recurring_todo, 'line'), {'startcolor' => "'#99ff99'"} + page.notify :notice, "Action was deleted. Because this action is recurring, a new action was added", 6.0 + else + if @todo.recurring_todo.todos.active.count == 0 + page.notify :notice, "There is no next action after the recurring action you just deleted. The recurrence is completed", 6.0 if @new_recurring_todo.nil? + end end end else page.notify :error, "There was an error deleting the item #{@todo.description}", 8.0 -end \ No newline at end of file +end app/views/todos/destroy.js.rjs f5162ed8daf33debd25118a82e01470995bb9f0b Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/30eeb634750f9e83c595e4667a73785143fd8112 30eeb634750f9e83c595e4667a73785143fd8112 2009-06-29T04:10:53-07:00 2009-06-29T04:10:53-07:00 fix #918. Thanks Claus for finding this. regression from last commit c13342c064c243b5333564fe8f4037fd8e4dfc9c Reinier Balt lrbalt@gmail.com