Skip to content

Fix datetime formatting and update timezone default handling #2779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickcharlton merged 1 commit into from
Feb 18, 2025
Merged

Fix datetime formatting and update timezone default handling #2779

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions lib/administrate/field/date_time.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ def date
def datetime
I18n.localize(
data.in_time_zone(timezone),
format: format,
default: data
format: format
)
end

Expand All @@ -25,7 +24,7 @@ def format
end

def timezone
options.fetch(:timezone, ::Time.zone.name || "UTC")
options.fetch(:timezone, ::Time.zone)
end
end
end
Expand Down