From 9878d5ab55e9f7fd5641051bb26ca257578e58f8 Mon Sep 17 00:00:00 2001 From: lrbalt Date: Fri, 21 Mar 2008 14:18:24 +0000 Subject: [PATCH] Fixes #658. Do better counting for hidden projects git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@758 a4c988fc-2ded-0310-b66e-134b36920a42 --- tracks/app/controllers/application.rb | 2 +- tracks/app/controllers/todos_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tracks/app/controllers/application.rb b/tracks/app/controllers/application.rb index c07f3db7..4335ee77 100644 --- a/tracks/app/controllers/application.rb +++ b/tracks/app/controllers/application.rb @@ -198,7 +198,7 @@ class ApplicationController < ActionController::Base def init_project_hidden_todo_counts(parents = ['project','context']) parents.each do |parent| - eval("@#{parent}_project_hidden_todo_counts = @#{parent}_project_hidden_todo_counts || Todo.count(:conditions => ['user_id = ? and state = ?', current_user.id, 'project_hidden'], :group => :#{parent}_id)") + eval("@#{parent}_project_hidden_todo_counts = @#{parent}_project_hidden_todo_counts || Todo.count(:conditions => ['user_id = ? and (state = ? or state = ?)', current_user.id, 'project_hidden', 'active'], :group => :#{parent}_id)") end end diff --git a/tracks/app/controllers/todos_controller.rb b/tracks/app/controllers/todos_controller.rb index 4392a624..1ee5af5c 100644 --- a/tracks/app/controllers/todos_controller.rb +++ b/tracks/app/controllers/todos_controller.rb @@ -459,7 +459,7 @@ class TodosController < ApplicationController end from.project do unless @todo.project_id == nil - @down_count = current_user.projects.find(@todo.project_id).not_done_todo_count + @down_count = current_user.projects.find(@todo.project_id).not_done_todo_count(:include_project_hidden_todos => true) @deferred_count = current_user.projects.find(@todo.project_id).deferred_todo_count end end