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

fix #857 and further refactoring for better done view

Browse source
This commit is contained in:
Reinier Balt 2011-06-17 13:33:54 +02:00
parent c61238933c
commit 35fe362b93
10 changed files with 76 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/contexts_controller.rb
View file

@ -35,7 +35,7 @@ class ContextsController < ApplicationController
def show
@contexts = current_user.contexts(true)
if (@context.nil?)
if @context.nil?
respond_to do |format|
format.html { render :text => 'Context not found', :status => 404 }
format.xml { render :xml => '<error>Context not found</error>', :status => 404 }
@ -240,7 +240,7 @@ class ContextsController < ApplicationController
def init_todos
set_context_from_params
unless @context.nil?
@context.todos.send :with_scope, :find => { :include => [:project, :tags] } do
@context.todos.send :with_scope, :find => { :include => [:project, :tags, :successors, :predecessors, :recurring_todo] } do
@done = @context.done_todos
end
@ -250,11 +250,9 @@ 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.find(
:all,
:conditions => ['todos.state = ? AND (todos.project_id IS ? OR projects.state = ?)', 'active', nil, 'active'],
@not_done_todos = @context.todos.active(
:order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC",
:include => [:project, :tags])
:include => [:project, :tags, :successors, :predecessors, :recurring_todo])
@projects = current_user.projects