mirror of
https://github.com/TracksApp/tracks.git
synced 2026-02-14 11:24:22 +01:00
fix #1255. Context view now has seperate container for pending and deferred todos
This commit is contained in:
parent
e1c0ff0683
commit
dd957f0feb
10 changed files with 475 additions and 431 deletions
|
|
@ -277,10 +277,13 @@ class ContextsController < ApplicationController
|
|||
# search manually until I can work out a way to do the same thing using
|
||||
# not_done_todos acts_as_todo_container method Hides actions in hidden
|
||||
# projects from context.
|
||||
@not_done_todos = @context.todos.not_completed(
|
||||
@not_done_todos = @context.todos.active(
|
||||
:order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC",
|
||||
:include => Todo::DEFAULT_INCLUDES)
|
||||
|
||||
@deferred = @context.todos.deferred(:include => Todo::DEFAULT_INCLUDES)
|
||||
@pending = @context.todos.pending(:include => Todo::DEFAULT_INCLUDES)
|
||||
|
||||
@projects = current_user.projects
|
||||
|
||||
@count = @not_done_todos.size
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue