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

revert some changes that introduced new errors

Browse source 
we need more tests!
This commit is contained in:
Reinier Balt 2009-04-20 11:26:45 +02:00
parent 19f029fe89
commit 77c9c3cd65
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/todos_controller.rb
View file

@ -655,7 +655,7 @@ class TodosController < ApplicationController
# false])
end
from.context do
@down_count = current_user.contexts.find(@todo.context_id).not_done_todos.count
@down_count = current_user.contexts.find(@todo.context_id).not_done_todo_count
end
from.project do
unless @todo.project_id == nil
@ -687,11 +687,10 @@ class TodosController < ApplicationController
if tag.nil?
tag = Tag.new(:name => params['tag'])
end
## TODO: this code is wrong!!!
@remaining_in_context = current_user.contexts.find(context_id).not_done_todo_count({:tag => tag.id})
}
end
@remaining_in_context = current_user.contexts.find(context_id).not_done_todos.count if @remaining_in_context.nil?
@remaining_in_context = current_user.contexts.find(context_id).not_done_todo_count if @remaining_in_context.nil?
end
def determine_completed_count
@ -700,7 +699,7 @@ class TodosController < ApplicationController
@completed_count = Todo.count_by_sql(['SELECT COUNT(*) FROM todos, contexts WHERE todos.context_id = contexts.id and todos.user_id = ? and todos.state = ? and contexts.hide = ?', current_user.id, 'completed', false])
end
from.context do
@completed_count = current_user.contexts.find(@todo.context_id).done_todos.count
@completed_count = current_user.contexts.find(@todo.context_id).done_todo_count
end
from.project do
unless @todo.project_id == nil