From 3e2238118720a1efe3ee9d2bc8900e5c8c1375f7 Mon Sep 17 00:00:00 2001
From: lukemelia <lukemelia@a4c988fc-2ded-0310-b66e-134b36920a42>
Date: Fri, 25 Aug 2006 04:24:58 +0000
Subject: [PATCH] Deleting actions was broken. Should be fixed now.

git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@317 a4c988fc-2ded-0310-b66e-134b36920a42
---
 tracks/app/controllers/todo_controller.rb | 10 +++++-----
 tracks/config/routes.rb                   |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tracks/app/controllers/todo_controller.rb b/tracks/app/controllers/todo_controller.rb
index 3a9f48a7..cfedb562 100644
--- a/tracks/app/controllers/todo_controller.rb
+++ b/tracks/app/controllers/todo_controller.rb
@@ -172,8 +172,8 @@ class TodoController < ApplicationController
   
   def destroy
     @item = check_user_return_item
-    context_id = @item.context_id
-    project_id = @item.project_id
+    @context_id = @item.context_id
+    @project_id = @item.project_id
     @saved = @item.destroy
     
     respond_to do |wants|
@@ -192,7 +192,7 @@ class TodoController < ApplicationController
           source_view do |from|
              from.todo do
                @remaining_undone_in_context = Todo.count(:conditions => ['user_id = ? and context_id = ? and type = ? and done = ?',
-                                                                          @user.id, context_id, "Immediate", false])
+                                                                          @user.id, @context_id, "Immediate", false])
              end
            end
         end
@@ -275,11 +275,11 @@ class TodoController < ApplicationController
          end
          from.context do
            @down_count = Todo.count(:conditions => ['todos.user_id = ? and todos.type = ? and todos.done = ? and todos.context_id = ?',
-                                                     @user.id, "Immediate", false, context_id])
+                                                     @user.id, "Immediate", false, @context_id])
          end
          from.project do
            @down_count = Todo.count(:conditions => ['todos.user_id = ? and todos.type = ? and todos.done = ? and todos.project_id = ?',
-                                                     @user.id, "Immediate", false, project_id]) unless project_id == nil
+                                                     @user.id, "Immediate", false, @project_id]) unless @project_id == nil
          end
       end
     end 
diff --git a/tracks/config/routes.rb b/tracks/config/routes.rb
index 95d6d5cd..3c558451 100644
--- a/tracks/config/routes.rb
+++ b/tracks/config/routes.rb
@@ -28,7 +28,6 @@ ActionController::Routing::Routes.draw do |map|
 
   # ToDo Routes
   map.connect 'done', :controller => 'todo', :action => 'completed'
-  map.connect 'delete/todo/:id', :controller =>'todo', :action => 'destroy'
 
   # Deferred (Tickler) Routes
   map.connect 'tickler', :controller => 'deferred', :action => 'index'