From 0e7a85befdba2c330f25a16d898daae2501d1e49 Mon Sep 17 00:00:00 2001 From: lrbalt Date: Thu, 20 Mar 2008 14:15:17 +0000 Subject: [PATCH] fixes #678. When viewing a context, actions without projects are now shown git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@755 a4c988fc-2ded-0310-b66e-134b36920a42 --- tracks/app/controllers/contexts_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tracks/app/controllers/contexts_controller.rb b/tracks/app/controllers/contexts_controller.rb index 493859e4..a63bd717 100644 --- a/tracks/app/controllers/contexts_controller.rb +++ b/tracks/app/controllers/contexts_controller.rb @@ -166,7 +166,11 @@ class ContextsController < ApplicationController # search manually until I can work out a way to do the same thing using # not_done_todos acts_as_todo_container method Hides actions in hidden # projects from context. - @not_done_todos = @context.todos.find(:all, :conditions => ['todos.state = ? AND projects.state = ?', 'active', 'active'], :order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC", :include => [:project, :tags]) + @not_done_todos = @context.todos.find( + :all, + :conditions => ['todos.state = ? AND (todos.project_id IS ? OR projects.state = ?)', 'active', nil, 'active'], + :order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC", + :include => [:project, :tags]) @count = @not_done_todos.size @default_project_context_name_map = build_default_project_context_name_map(@projects).to_json end