Changeset 776

Timestamp:

02/23/05 23:55:59 (4 years ago)

Author:

david

Message:

Fixed TimeZone issues in action-pack and active-support #704

Files:

• trunk/actionpack/lib/action_view/helpers/form_options_helper.rb (modified) (2 diffs)
• trunk/activesupport/lib/active_support/values/time_zone.rb (modified) (1 diff)

trunk/actionpack/lib/action_view/helpers/form_options_helper.rb

@@ -186 +186 @@
-      # obtaining a list of the US time zones.)
-      #
+      # The +selected+ parameter must be either +nil+, or a string that names
+      # a TimeZone.
+      #
-      # By default, +model+ is the TimeZone constant (which can be obtained
-      # in ActiveRecord as a value object). The only requirement is that the
@@ -196 +199 @@
-        zone_options = ""
-
+        zones = model.all
+        convert_zones = lambda { |list| list.map { |z| [ z.to_s, z.name ] } }
+
-        if priority_zones
-priority_zones
+convert_zones[priority_zones]
-          zone_options += "<option>-------------</option>\n"
-
-
-
-
-
-
-
+
+
+
+
-        zone_options
-      end

trunk/activesupport/lib/active_support/values/time_zone.rb

@@ -38 +38 @@
-  end
-
+  # Return the current date in this time zone.
+  def today
+    now.to_date
+  end
+
-  # Adjust the given time to the time zone represented by +self+.
-  def adjust(time)
+    time = time.to_time
-    offset = time.utc_offset
-    time + utc_offset - offset