From 296b8135a10becd497cf481c5c3fec9a11f8712c Mon Sep 17 00:00:00 2001 From: Carsten Otto Date: Wed, 13 May 2015 23:46:35 +0200 Subject: [PATCH 1/2] make code of completed projects and completed recurring actions more similar --- app/controllers/projects_controller.rb | 6 +++--- app/controllers/recurring_todos_controller.rb | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index b6bed421..df381bc5 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -79,14 +79,14 @@ 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 init_not_done_counts(['project']) diff --git a/app/controllers/recurring_todos_controller.rb b/app/controllers/recurring_todos_controller.rb index 048df3b0..80a096a9 100644 --- a/app/controllers/recurring_todos_controller.rb +++ b/app/controllers/recurring_todos_controller.rb @@ -26,12 +26,14 @@ 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 end From 5ffaf98c7b19159381f11b1bdf705b36f258fb75 Mon Sep 17 00:00:00 2001 From: Carsten Otto Date: Thu, 14 May 2015 12:53:24 +0200 Subject: [PATCH 2/2] show 0-0 instead of 1-0 if no project/action exists limit maximum to actual number of projects/actions --- app/controllers/projects_controller.rb | 3 +++ app/controllers/recurring_todos_controller.rb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index df381bc5..ee4c71f2 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -89,6 +89,9 @@ class ProjectsController < ApplicationController @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 80a096a9..e5d2cbbe 100644 --- a/app/controllers/recurring_todos_controller.rb +++ b/app/controllers/recurring_todos_controller.rb @@ -36,6 +36,9 @@ class RecurringTodosController < ApplicationController @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