From 725ff5e0fad58c664e317fd0a2475f5829959887 Mon Sep 17 00:00:00 2001 From: Sebastian Fischmeister Date: Tue, 14 Feb 2012 10:16:29 -0500 Subject: [PATCH 1/2] don't execute a query when limit == 0 --- app/controllers/projects_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 2110ee1d..2cfe530d 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -94,8 +94,12 @@ class ProjectsController < ApplicationController @not_done = @project.todos.active_or_hidden(:include => Todo::DEFAULT_INCLUDES) @deferred = @project.todos.deferred(:include => Todo::DEFAULT_INCLUDES) @pending = @project.todos.pending(:include => Todo::DEFAULT_INCLUDES) + + @done = {} @done = @project.todos.find_in_state(:all, :completed, - :order => "todos.completed_at DESC", :limit => current_user.prefs.show_number_completed, :include => Todo::DEFAULT_INCLUDES) + :order => "todos.completed_at DESC", + :limit => current_user.prefs.show_number_completed, + :include => Todo::DEFAULT_INCLUDES) if current_user.prefs.show_number_completed > 0 @count = @not_done.size @down_count = @count + @deferred.size + @pending.size From 0f39034986030e81355d212f8d72a32fd232dee9 Mon Sep 17 00:00:00 2001 From: Sebastian Fischmeister Date: Fri, 24 Feb 2012 16:46:11 -0500 Subject: [PATCH 2/2] removed whitespaces and matched the style with the todo_controller.rb (unless) --- app/controllers/projects_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 2cfe530d..2adea3c9 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -97,9 +97,9 @@ class ProjectsController < ApplicationController @done = {} @done = @project.todos.find_in_state(:all, :completed, - :order => "todos.completed_at DESC", - :limit => current_user.prefs.show_number_completed, - :include => Todo::DEFAULT_INCLUDES) if current_user.prefs.show_number_completed > 0 + :order => "todos.completed_at DESC", + :limit => current_user.prefs.show_number_completed, + :include => Todo::DEFAULT_INCLUDES) unless current_user.prefs.show_number_completed == 0 @count = @not_done.size @down_count = @count + @deferred.size + @pending.size