Changeset 230 for trunk/trax/vendor

Timestamp:

07/18/06 12:47:39 (6 years ago)

Author:

john

Message:

added the value option to date_select()

Files:

• trunk/trax/vendor/trax/action_view/helpers/date_helper.php (modified) (6 diffs)

trunk/trax/vendor/trax/action_view/helpers/date_helper.php

@@ -598 +598 @@
             $datetime_sec = $datetime;
         } else {                  
-            $datetime = $datetime ? $datetime : date("Y-m-d H:i:s"); 
+            $datetime = $options['value'] ? $options['value'] :
+                ($datetime ? $datetime : date("Y-m-d H:i:s")); 
             $datetime_sec = date("s",strtotime($datetime));
         }
@@ -674 +675 @@
             $datetime_min = $datetime;
         } else {                  
-            $datetime = $datetime ? $datetime : date("Y-m-d H:i:s"); 
+            #$datetime = $datetime ? $datetime : date("Y-m-d H:i:s"); 
+            $datetime = $options['value'] ? $options['value'] :
+                ($datetime ? $datetime : date("Y-m-d H:i:s"));            
             $datetime_min = date("i",strtotime($datetime));
         }
@@ -762 +765 @@
         //  initially select current hour
         else {                  
-            $datetime = $datetime ? $datetime : date("Y-m-d H:i:s"); 
+            #$datetime = $datetime ? $datetime : date("Y-m-d H:i:s"); 
+            $datetime = $options['value'] ? $options['value'] :
+                ($datetime ? $datetime : date("Y-m-d H:i:s"));
             $datetime_hour = date("H",strtotime($datetime)); 
         }
@@ -854 +859 @@
         //  initially select current day
         else {                  
-            $datetime = $datetime ? $datetime : date("Y-m-d H:i:s"); 
+            #$datetime = $datetime ? $datetime : date("Y-m-d H:i:s");
+            $datetime = $options['value'] ? $options['value'] :
+                ($datetime ? $datetime : date("Y-m-d H:i:s"));
             $datetime_day = date("d",strtotime($datetime));  
         }
@@ -952 +959 @@
         //  in first argument if present, otherwise select current month
         else {
-            $date = $date ? $date : date("Y-m-d H:i:s"); 
+            $date = $options['value'] ? $options['value'] :
+                ($date ? $date : date("Y-m-d H:i:s"));
             $date_month = date("m",strtotime($date));  
         }
@@ -1072 +1080 @@
             //  If first argument was null, use the current year for
             //  the initial value.
-            $date_year = $date ? date("Y",strtotime($date)) : date("Y");
+            $date = $options['value'] ? $options['value'] :
+                ($date ? $date : date("Y-m-d H:i:s"));
+            $date_year = date("Y",strtotime($date));
         }