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

get the first cucumber feature running: calendar

Browse source
This commit is contained in:
Reinier Balt 2012-04-30 13:51:42 +02:00
parent 393eae1937
commit c9d64e6f4b
28 changed files with 400 additions and 418 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/todos_controller.rb
View file

@ -108,8 +108,7 @@ class TodosController < ApplicationController
includes(:project, :context, :tags)
else
@todos = current_user.todos.includes(Todo::DEFAULT_INCLUDES)
@not_done_todos = current_user.todos.
where('contexts.hide = ? AND (projects.state = ? OR todos.project_id IS NULL)', false, 'active').
@not_done_todos = current_user.todos.active.not_hidden.
reorder("todos.due IS NULL, todos.due ASC, todos.created_at ASC").
includes(Todo::DEFAULT_INCLUDES)
end
@ -360,7 +359,7 @@ class TodosController < ApplicationController
end
def edit
@todo = current_user.todos.find_by_id(params['id']).includes(Todo::DEFAULT_INCLUDES)
@todo = current_user.todos.find(params['id'])
@source_view = params['_source_view'] || 'todo'
@tag_name = params['_tag_name']
respond_to do |format|