aas/additionals
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use Time.current instead of Time.zone.now. Time.zone.now is nil without timezone starting with Rails7

Browse Source
This commit is contained in:
Alexander Meindl 2022-06-29 09:28:17 +02:00
parent cbf929021b
commit 2b422d85de
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/additionals.rb
View File

@ -25,7 +25,7 @@ module Additionals
def now_with_user_time_zone(user = User.current) def now_with_user_time_zone(user = User.current)
if user.time_zone.nil? if user.time_zone.nil?
Time.zone.now Time.current
else else
user.time_zone.now user.time_zone.now
end end

2
lib/additionals/patches/time_entry_patch.rb
View File

@ -27,7 +27,7 @@ module Additionals
def validate_issue_allowed def validate_issue_allowed
return unless issue_id && issue return unless issue_id && issue
# NOTE: do not use user time zone here, because issue do not use it # NOTE: do not use user time zone here, because issue do not use it
return if Setting.commit_logtime_enabled? && (issue.updated_on + 5.seconds) > Time.zone.now return if Setting.commit_logtime_enabled? && (issue.updated_on + 5.seconds) > Time.current
errors.add :issue_id, :issue_log_time_not_allowed unless issue.log_time_allowed? errors.add :issue_id, :issue_log_time_not_allowed unless issue.log_time_allowed?
end end