Fixed: Pre-filled time tracking date ignores timezone (#4160).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3012 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
54e37b12fd
commit
6245f49934
|
@ -210,7 +210,7 @@ class TimelogController < ApplicationController
|
|||
|
||||
def edit
|
||||
render_403 and return if @time_entry && !@time_entry.editable_by?(User.current)
|
||||
@time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
|
||||
@time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
|
||||
@time_entry.attributes = params[:time_entry]
|
||||
|
||||
call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
|
||||
|
|
|
@ -224,6 +224,15 @@ class User < Principal
|
|||
name
|
||||
end
|
||||
|
||||
# Returns the current day according to user's time zone
|
||||
def today
|
||||
if time_zone.nil?
|
||||
Date.today
|
||||
else
|
||||
Time.now.in_time_zone(time_zone).to_date
|
||||
end
|
||||
end
|
||||
|
||||
def logged?
|
||||
true
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue