diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 64ed3903..29f6a07d 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -79,16 +79,19 @@ class ProjectsController < ApplicationController @source_view = params['_source_view'] || 'project_list' @page_title = t('projects.list_completed_projects') + items_per_page = 20 page = params[:page] || 1 - projects_per_page = 20 - @projects = current_user.projects.completed.paginate :page => page, :per_page => projects_per_page + @projects = current_user.projects.completed.paginate :page => page, :per_page => items_per_page @count = @projects.count @total = current_user.projects.completed.count @no_projects = @projects.empty? - @range_low = (page.to_i-1) * projects_per_page + 1 + @range_low = (page.to_i-1) * items_per_page + 1 @range_high = @range_low + @projects.size - 1 + @range_low = 0 if @total == 0 + @range_high = @total if @range_high > @total + init_not_done_counts(['project']) end diff --git a/app/controllers/recurring_todos_controller.rb b/app/controllers/recurring_todos_controller.rb index 048df3b0..e5d2cbbe 100644 --- a/app/controllers/recurring_todos_controller.rb +++ b/app/controllers/recurring_todos_controller.rb @@ -26,14 +26,19 @@ class RecurringTodosController < ApplicationController end def done - @page_title = t('todos.completed_recurring_actions_title') @source_view = params['_source_view'] || 'recurring_todo' + @page_title = t('todos.completed_recurring_actions_title') + items_per_page = 20 page = params[:page] || 1 - @completed_recurring_todos = current_user.recurring_todos.completed.paginate :page => params[:page], :per_page => items_per_page + @completed_recurring_todos = current_user.recurring_todos.completed.paginate :page => page, :per_page => items_per_page @total = @count = current_user.recurring_todos.completed.count + @range_low = (page.to_i-1) * items_per_page + 1 @range_high = @range_low + @completed_recurring_todos.size - 1 + + @range_low = 0 if @total == 0 + @range_high = @total if @range_high > @total end def edit