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

fix some failing cucumber tests

Browse source
This commit is contained in:
Reinier Balt 2014-01-09 11:18:33 +01:00
parent def136374c
commit 3b673f0838
12 changed files with 41 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/todos_controller.rb
View file

@ -522,7 +522,7 @@ class TodosController < ApplicationController
@source_view = 'done'
@page_title = t('todos.completed_tasks_title')
@done_today, @done_rest_of_week, @done_rest_of_month = DoneTodos.done_todos_for_container(current_user)
@done_today, @done_rest_of_week, @done_rest_of_month = DoneTodos.done_todos_for_container(current_user.todos)
@count = @done_today.size + @done_rest_of_week.size + @done_rest_of_month.size
respond_to do |format|
@ -672,7 +672,7 @@ class TodosController < ApplicationController
end
def done_by_tag_setup
@source_view = params['_source_view'] || 'tag'
@source_view = params['_source_view'] || 'done'
@tag_name = sanitize(params[:name]) # sanitize to prevent XSS vunerability!
@page_title = t('todos.all_completed_tagged_page_title', :tag_name => @tag_name)
@tag = Tag.where(:name => @tag_name).first_or_create
@ -762,7 +762,7 @@ class TodosController < ApplicationController
@items = get_not_completed_for_predecessor(current_user, @todo.id) unless !@items.empty?
else
# New todo - TODO: Filter on current project in project view
@items = get_not_complete_for_predecessor(current_user)
@items = get_not_completed_for_predecessor(current_user)
end
render :inline => format_dependencies_as_json_for_auto_complete(@items)
end
@ -1003,7 +1003,10 @@ end
@target_context_count = actions_in_target.count
}
from.done {
@remaining_in_context = DoneTodos.remaining_in_container(current_user, @original_completed_period)
@remaining_in_context = DoneTodos.remaining_in_container(current_user.todos, @original_completed_period)
}
from.all_done {
@remaining_in_context = current_user.todos.completed.count
}
end
end