fix: avo time_zone options (#1952)

bullet-train-co · Feb 19, 2025 · 7a438fc · 7a438fc
1 parent f835727
commit 7a438fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/avo/resources/team.rb b/app/avo/resources/team.rb
@@ -15,7 +15,9 @@ def fields
     field :name, as: :text
     field :slug, as: :text
     field :being_destroyed, as: :boolean, hide_on: :forms
-    field :time_zone, as: :select, options: -> { view_context.time_zone_options_for_select(Avo::Current.user.time_zone, nil, ActiveSupport::TimeZone) }
+    field :time_zone, as: :select, options: -> {
+      ActiveSupport::TimeZone.all.map { |tz| ["(GMT#{tz.formatted_offset}) #{tz.name}", tz.name] }.to_h 
+    }
     field :locale, as: :text
     field :users, as: :has_many, through: :memberships
     field :memberships, as: :has_many

diff --git a/app/avo/resources/user.rb b/app/avo/resources/user.rb
@@ -15,7 +15,9 @@ def fields
     field :email, as: :text
     field :first_name, as: :text
     field :last_name, as: :text
-    field :time_zone, as: :select, options: -> { view_context.time_zone_options_for_select(Avo::Current.user.time_zone, nil, ActiveSupport::TimeZone) }
+    field :time_zone, as: :select, options: -> { 
+      ActiveSupport::TimeZone.all.map { |tz| ["(GMT#{tz.formatted_offset}) #{tz.name}", tz.name] }.to_h
+    }
     field :current_team, as: :belongs_to
 
     field :teams, as: :has_many, through: :teams