diff --git a/tracks/app/controllers/todo_controller.rb b/tracks/app/controllers/todo_controller.rb index 69700d92..865e4f30 100644 --- a/tracks/app/controllers/todo_controller.rb +++ b/tracks/app/controllers/todo_controller.rb @@ -35,11 +35,11 @@ class TodoController < ApplicationController day = (60 * 60 * 24) today = Time.now - today_date = today - 1 * day - week_begin = today - 2 * day - week_end = today - 7* day - month_begin = today - 8 * day - month_end = today - 31 * day + today_date = today - (1 * day) + week_begin = today - (1 * day) + week_end = today - (7 * day) + month_begin = today - (8 * day) + month_end = today - (31 * day) @done_today = @done.collect { |x| today_date <= x.completed ? x:nil }.compact @done_this_week = @done.collect { |x| week_begin >= x.completed && week_end <= x.completed ? x:nil }.compact diff --git a/tracks/app/views/shared/add_new_item_form.rhtml b/tracks/app/views/shared/add_new_item_form.rhtml index 34d32b9f..6d5a1655 100644 --- a/tracks/app/views/shared/add_new_item_form.rhtml +++ b/tracks/app/views/shared/add_new_item_form.rhtml @@ -20,7 +20,7 @@ :url => { :controller => "todo", :action => "add_item" }, :update => "new_actions", :position=> "bottom", - :complete => "Form.focusFirstElement('todo-form-new-action');Form.reset('todo-form-new-action')", + :complete => "Form.focusFirstElement('todo-form-new-action');Form.reset('todo-form-new-action');", :html=> { :id=>'todo-form-new-action', :name=>'todo', :class => 'inline-form' }) %>