diff --git a/tracks/app/controllers/application.rb b/tracks/app/controllers/application.rb index 4e8e8b8f..88aef29d 100644 --- a/tracks/app/controllers/application.rb +++ b/tracks/app/controllers/application.rb @@ -108,13 +108,7 @@ class ApplicationController < ActionController::Base def parse_date_per_user_prefs( s ) return nil if s.blank? - #logger.info "Unadjusting user date #{s} from #{@user.prefs.tz} parsing with #{@user.prefs.date_format}" - time = Date.strptime(s, @user.prefs.date_format) - #logger.info "parsed = #{time}" - unadjusted = @user.prefs.tz.unadjust(time).utc - #logger.info "unadjusted = #{unadjusted}" - #logger.info "returning #{unadjusted.to_date}" - unadjusted.to_date + Date.strptime(s, @user.prefs.date_format) end def init_data_for_sidebar diff --git a/tracks/test/functional/todos_controller_test.rb b/tracks/test/functional/todos_controller_test.rb index 0a3ac54c..6ae87e34 100644 --- a/tracks/test/functional/todos_controller_test.rb +++ b/tracks/test/functional/todos_controller_test.rb @@ -101,7 +101,7 @@ class TodosControllerTest < Test::Unit::TestCase t = Todo.find(1) assert_equal "Call Warren Buffet to find out how much he makes per day", t.description assert_equal "foo, bar", t.tag_list - expected = Date.new(2006,11,30).to_time.utc.to_date + expected = Date.new(2006,11,30) actual = t.due assert_equal expected, actual, "Expected #{expected.to_s(:db)}, was #{actual.to_s(:db)}" end