Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-09-22 05:50:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

make code of completed projects and completed recurring actions more similar

Browse source
This commit is contained in:
Carsten Otto 2015-05-13 23:46:35 +02:00
parent 660238d2cf
commit 296b8135a1
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/projects_controller.rb
View file

@ -79,14 +79,14 @@ class ProjectsController < ApplicationController
@source_view = params['_source_view'] || 'project_list' @source_view = params['_source_view'] || 'project_list'
@page_title = t('projects.list_completed_projects') @page_title = t('projects.list_completed_projects')
items_per_page = 20
page = params[:page] || 1 page = params[:page] || 1
projects_per_page = 20 @projects = current_user.projects.completed.paginate :page => page, :per_page => items_per_page
@projects = current_user.projects.completed.paginate :page => page, :per_page => projects_per_page
@count = @projects.count @count = @projects.count
@total = current_user.projects.completed.count @total = current_user.projects.completed.count
@no_projects = @projects.empty? @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_high = @range_low + @projects.size - 1
init_not_done_counts(['project']) init_not_done_counts(['project'])

6
app/controllers/recurring_todos_controller.rb
View file

@ -26,12 +26,14 @@ class RecurringTodosController < ApplicationController
end end
def done def done
@page_title = t('todos.completed_recurring_actions_title')
@source_view = params['_source_view'] || 'recurring_todo' @source_view = params['_source_view'] || 'recurring_todo'
@page_title = t('todos.completed_recurring_actions_title')
items_per_page = 20 items_per_page = 20
page = params[:page] || 1 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 @total = @count = current_user.recurring_todos.completed.count
@range_low = (page.to_i-1) * items_per_page + 1 @range_low = (page.to_i-1) * items_per_page + 1
@range_high = @range_low + @completed_recurring_todos.size - 1 @range_high = @range_low + @completed_recurring_todos.size - 1
end end