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

Remove deprecations printed out in the test suite

Browse source
This commit is contained in:
Matt Rogers 2018-11-20 19:57:02 -06:00
parent d3c9975606
commit f2647e3f94
No known key found for this signature in database
GPG key ID: 605D017C07EB4316
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/todos_controller.rb
View file

@ -629,19 +629,19 @@ class TodosController < ApplicationController
@not_done_todos = todos_with_tag_ids.
active.not_hidden.
reorder('todos.due IS NULL, todos.due ASC, todos.created_at ASC').
reorder(Arel.sql('todos.due IS NULL, todos.due ASC, todos.created_at ASC')).
includes(Todo::DEFAULT_INCLUDES)
@hidden_todos = todos_with_tag_ids.
hidden.
reorder('todos.completed_at DESC, todos.created_at DESC').
reorder(Arel.sql('todos.completed_at DESC, todos.created_at DESC')).
includes(Todo::DEFAULT_INCLUDES)
@deferred_todos = todos_with_tag_ids.
deferred.
reorder('todos.show_from ASC, todos.created_at DESC').
reorder(Arel.sql('todos.show_from ASC, todos.created_at DESC')).
includes(Todo::DEFAULT_INCLUDES)
@pending_todos = todos_with_tag_ids.
blocked.
reorder('todos.show_from ASC, todos.created_at DESC').
reorder(Arel.sql('todos.show_from ASC, todos.created_at DESC')).
includes(Todo::DEFAULT_INCLUDES)
@todos_without_project = @not_done_todos.select{|t| t.project.nil?}
@ -1323,7 +1323,7 @@ end
end
not_done_todos = not_done_todos.
reorder("todos.due IS NULL, todos.due ASC, todos.created_at ASC").
reorder(Arel.sql("todos.due IS NULL, todos.due ASC, todos.created_at ASC")).
includes(Todo::DEFAULT_INCLUDES)
not_done_todos = not_done_todos.limit(sanitize(params[:limit])) if params[:limit]