Changeset 1465

Timestamp:

12/08/2007 01:25:35 AM (13 months ago)

Author:

Shadowhand

Message:

A couple small Dateselect fixes

Location:

trunk/modules/forge

Files:

• controllers/forge_demo.php (modified) (1 diff)
• libraries/Form_Dateselect.php (modified) (5 diffs)

trunk/modules/forge/controllers/forge_demo.php

@@ -27 +27 @@
                 $form->checklist('foods')->label('Favorite Foods')->options($foods)->rules('required');
                 $form->dropdown('state')->label('Home State')->options(locale_US::states())->rules('required');
-                $form->dateselect('birthday')->label(TRUE)->minutes(5);
+                $form->dateselect('birthday')->label(TRUE)->minutes(15)->years(1950, date('Y'));
                 $form->submit('Save');
 

trunk/modules/forge/libraries/Form_Dateselect.php

@@ -14 +14 @@
         protected $parts = array
         (
-                'month'   => NULL,
-                'day'     => 1,
-                'year'    => NULL,
+                'month'   => array(),
+                'day'     => array(1),
+                'year'    => array(),
                 ' @ ',
-                'hour'    => NULL,
+                'hour'    => array(),
                 ':',
-                'minute'  => 5,
-                'am_pm'   => NULL,
+                'minute'  => array(5),
+                'am_pm'   => array(),
         );
 
@@ -38 +38 @@
                 {
                         // Set options for date generation
-                        $this->parts[substr($method, 0, -1)] = $args[0];
+                        $this->parts[substr($method, 0, -1)] = $args;
                         return $this;
                 }
@@ -57 +57 @@
 
                 $input = '';
-                foreach($this->parts as $type => $option)
+                foreach($this->parts as $type => $val)
                 {
                         if (is_int($type))
                         {
                                 // Just add the separators
-                                $input .= $option;
+                                $input .= $val;
                                 continue;
                         }
@@ -83 +83 @@
 
                                 // Use the date helper to generate the options
-                                $options = ($option === NULL) ? date::$type() : date::$type($option);
+                                $options = empty($val) ? date::$type() : call_user_func_array(array('date', $type), $val);
                         }
 
@@ -101 +101 @@
 
                 // Minutes should always be in 5 minute increments
-                $time['minute'] = num::round($time['minute'], $this->parts['minute']);
+                $time['minute'] = num::round($time['minute'], current($this->parts['minute']));
 
                 return $time;