make sure toggle_check and deleting of todos, recurring_todos and projects work in the new done views

app/controllers/recurring_todos_controller.rb

@@ -7,7 +7,7 @@ class RecurringTodosController < ApplicationController
 
   def index
     @page_title = t('todos.recurring_actions_title')
-
+    @source_view = params['_source_view'] || 'recurring_todo'
     find_and_inactivate
     @recurring_todos = current_user.recurring_todos.active
     @completed_recurring_todos = current_user.recurring_todos.completed.find(:all, :limit => 10)
@@ -27,6 +27,7 @@ class RecurringTodosController < ApplicationController
   
   def done
     @page_title = t('todos.completed_recurring_actions_title')
+    @source_view = params['_source_view'] || 'recurring_todo'
     items_per_page = 20
     page = params[:page] || 1    
     @completed_recurring_todos = current_user.recurring_todos.completed.paginate :page => params[:page], :per_page => items_per_page
@@ -141,7 +142,6 @@ class RecurringTodosController < ApplicationController
   end
   
   def destroy
-    
     # remove all references to this recurring todo
     @todos = @recurring_todo.todos
     @number_of_todos = @todos.size
@@ -186,7 +186,6 @@ class RecurringTodosController < ApplicationController
       @completed_remaining = current_user.recurring_todos.completed.count
       
       # from completed back to active -> check if there is an active todo
-      # current_user.todos.count(:all, {:conditions => ["state = ? AND recurring_todo_id = ?", 'active',params[:id]]})
       @active_todos = @recurring_todo.todos.active.count
       # create todo if there is no active todo belonging to the activated
       # recurring_todo

app/controllers/todos_controller.rb

@@ -282,15 +282,11 @@ class TodosController < ApplicationController
     # check if this todo has a related recurring_todo. If so, create next todo
     @new_recurring_todo = check_for_next_todo(@todo) if @saved
     
-    if @todo.completed?
-      @pending_to_activate = @todo.pending_to_activate
-      @pending_to_activate.each do |t|
-        t.activate!
-      end
-    else
-      @active_to_block = @todo.active_to_block
-      @active_to_block.each do |t|
-        t.block!
+    if @saved
+      if @todo.completed?
+        @pending_to_activate = @todo.activate_pending_todos 
+      else
+        @active_to_block = @todo.block_successors
       end
     end
     
@@ -1214,17 +1210,13 @@ class TodosController < ApplicationController
   def update_completed_state
     if params['done'] == '1' && !@todo.completed?
       @todo.complete!
-      @todo.pending_to_activate.each do |t|
-        t.activate!
-      end
+      @todo.activate_pending_todos
     end
     # strange. if checkbox is not checked, there is no 'done' in params.
     # Therefore I've used the negation
     if !(params['done'] == '1') && @todo.completed?
       @todo.activate!
-      @todo.active_to_block.each do |t|
-        t.block!
-      end
+      @todo.block_successors
     end
   end