From c89d8f0012a6b14df7ec305c9d56bead72a39522 Mon Sep 17 00:00:00 2001 From: lukemelia Date: Mon, 2 Apr 2007 05:09:07 +0000 Subject: [PATCH] Fixed #491 (broken: Actions completed in the last 7 days). Thanks for the bug report, SK. Also, removed some junk from the data_controller test output. git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@520 a4c988fc-2ded-0310-b66e-134b36920a42 --- tracks/app/controllers/todos_controller.rb | 2 +- tracks/test/functional/data_controller_test.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tracks/app/controllers/todos_controller.rb b/tracks/app/controllers/todos_controller.rb index 2925f76d..c4c8da00 100644 --- a/tracks/app/controllers/todos_controller.rb +++ b/tracks/app/controllers/todos_controller.rb @@ -445,7 +445,7 @@ class TodosController < ApplicationController else # Exclude hidden projects from count on home page - @todos = @user.todos.find(:all, :conditions => ['todos.state = ? or todos.state = ?', 'active', 'complete'], :include => [ :project, :context, :tags ]) + @todos = @user.todos.find(:all, :conditions => ['todos.state = ? or todos.state = ?', 'active', 'completed'], :include => [ :project, :context, :tags ]) # Exclude hidden projects from the home page @not_done_todos = @user.todos.find(:all, :conditions => ['todos.state = ?', 'active'], :order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC", :include => [ :project, :context, :tags ]) diff --git a/tracks/test/functional/data_controller_test.rb b/tracks/test/functional/data_controller_test.rb index 2a1e4239..02c58840 100644 --- a/tracks/test/functional/data_controller_test.rb +++ b/tracks/test/functional/data_controller_test.rb @@ -17,6 +17,5 @@ class DataControllerTest < Test::Unit::TestCase def test_csv_export_completes_without_error @request.session['user_id'] = users(:admin_user).id get :csv_notes - puts @response.body end end