Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-06 09:18:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1805 from C-Otto/tracks-1727

Browse source 
Sort deferred actions by "show from" in tickler, #1727
This commit is contained in:
Reinier Balt 2015-04-13 16:24:17 +02:00
commit 55e28d90a9
4 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/todos_controller.rb
View file

@ -558,7 +558,7 @@ class TodosController < ApplicationController
includes = params[:format]=='xml' ? [:context, :project] : Todo::DEFAULT_INCLUDES
@not_done_todos = current_user.todos.deferred.includes(includes) + current_user.todos.pending.includes(includes)
@not_done_todos = current_user.todos.deferred.includes(includes).reorder('show_from') + current_user.todos.pending.includes(includes)
@todos_without_project = @not_done_todos.select{|t|t.project.nil?}
@down_count = @count = @not_done_todos.size