jro_apps/redmine Commit - r2898:6245f49934d2

Fixed: Pre-filled time tracking date ignores timezone (#4160)....

Jean-Philippe Lang -

r2898:6245f49934d2

parent child

Context file:

r2898:6245f49934d2

app/controllers/timelog_controller.rb +1 -1

                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 })

app/models/user.rb +9 0

                  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

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages