From 7cf219afb9d4870daec94ada6c1e3e5105f730bd Mon Sep 17 00:00:00 2001 From: lukemelia Date: Sat, 29 Jul 2006 10:26:57 +0000 Subject: [PATCH] Fix context and project list feeds, which were broken in one of the last two changesets. git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@296 a4c988fc-2ded-0310-b66e-134b36920a42 --- tracks/app/controllers/application.rb | 13 ++++++------- tracks/app/controllers/feed_controller.rb | 2 ++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tracks/app/controllers/application.rb b/tracks/app/controllers/application.rb index a7f494bf..cedfbe1d 100644 --- a/tracks/app/controllers/application.rb +++ b/tracks/app/controllers/application.rb @@ -82,13 +82,12 @@ class ApplicationController < ActionController::Base init_not_done_counts end - def init_not_done_counts - @project_not_done_counts = Todo.count(:todo, - :conditions => ['todos.user_id = ? and todos.type = ? and todos.done = ?', @user.id, "Immediate", false], - :group => :project_id) - @context_not_done_counts = Todo.count(:todo, - :conditions => ['todos.user_id = ? and todos.type = ? and todos.done = ?', @user.id, "Immediate", false], - :group => :context_id) + def init_not_done_counts(parents = ['project','context']) + parents.each {|parent| + eval("@#{parent}_not_done_counts = Todo.count(:todo, + :conditions => ['todos.user_id = ? and todos.type = ? and todos.done = ?', @user.id, \"Immediate\", false], + :group => :#{parent}_id)") + } end end diff --git a/tracks/app/controllers/feed_controller.rb b/tracks/app/controllers/feed_controller.rb index 93a8d5b2..2c965c68 100644 --- a/tracks/app/controllers/feed_controller.rb +++ b/tracks/app/controllers/feed_controller.rb @@ -55,12 +55,14 @@ class FeedController < ApplicationController end def list_projects_only + init_not_done_counts('project') @projects = @user.projects @description = "Lists all the projects for #{@user.login}." render :action => 'projects_' + params['feedtype'] end def list_contexts_only + init_not_done_counts('context') @contexts = @user.contexts @description = "Lists all the contexts for #{@user.login}." render :action => 'contexts_' + params['feedtype']