Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into 2.3

  • Loading branch information...
commit d2010308d44140670178d342597da91b145604b8 2 parents 3ee267d + 3729ac1
@markstory markstory authored
View
40 lib/Cake/Test/Case/View/Helper/FormHelperTest.php
@@ -2242,9 +2242,9 @@ public function testInputTime() {
'type' => 'time',
'selected' => '18:15'
));
- $this->assertRegExp('#<option value="06"[^>]*>6</option>#', $result);
- $this->assertRegExp('#<option value="15"[^>]*>15</option>#', $result);
- $this->assertRegExp('#<option value="pm"[^>]*>pm</option>#', $result);
+ $this->assertContains('<option value="06" selected="selected">6</option>', $result);
+ $this->assertContains('<option value="15" selected="selected">15</option>', $result);
+ $this->assertContains('<option value="pm" selected="selected">pm</option>', $result);
}
/**
@@ -2254,6 +2254,15 @@ public function testInputTime() {
*/
public function testTimeSelectedWithInterval() {
$result = $this->Form->input('Model.start_time', array(
+ 'type' => 'time',
+ 'interval' => 15,
+ 'selected' => '2012-10-23 15:57:00'
+ ));
+ $this->assertContains('<option value="04" selected="selected">4</option>', $result);
+ $this->assertContains('<option value="00" selected="selected">00</option>', $result);
+ $this->assertContains('<option value="pm" selected="selected">pm</option>', $result);
+
+ $result = $this->Form->input('Model.start_time', array(
'timeFormat' => 24,
'type' => 'time',
'interval' => 15,
@@ -5711,26 +5720,11 @@ public function testHour() {
$this->Form->request->data['Model']['field'] = '';
$result = $this->Form->hour('Model.field', true, array('value' => '23'));
- $expected = array(
- array('select' => array('name' => 'data[Model][field][hour]', 'id' => 'ModelFieldHour')),
- array('option' => array('value' => '')),
- '/option',
- array('option' => array('value' => '00')),
- '0',
- '/option',
- array('option' => array('value' => '01')),
- '1',
- '/option',
- array('option' => array('value' => '02')),
- '2',
- '/option',
- $hoursRegex,
- array('option' => array('value' => '23', 'selected' => 'selected')),
- '23',
- '/option',
- '/select',
- );
- $this->assertTags($result, $expected);
+ $this->assertContains('<option value="23" selected="selected">23</option>', $result);
+
+ $result = $this->Form->hour('Model.field', false, array('value' => '23'));
+ $this->assertContains('<option value="11" selected="selected">11</option>', $result);
+
$this->Form->request->data['Model']['field'] = '2006-10-10 00:12:32';
$result = $this->Form->hour('Model.field', true);
View
10 lib/Cake/View/Helper/FormHelper.php
@@ -2059,6 +2059,11 @@ public function hour($fieldName, $format24Hours = false, $attributes = array())
} elseif ($attributes['value'] === false) {
$attributes['value'] = null;
}
+
+ if ($attributes['value'] > 12 && !$format24Hours) {
+ $attributes['value'] -= 12;
+ }
+
return $this->select(
$fieldName . ".hour",
$this->_generateOptions($format24Hours ? 'hour24' : 'hour'),
@@ -2223,10 +2228,7 @@ public function dateTime($fieldName, $dateFormat = 'DMY', $timeFormat = '12', $a
if (!empty($timeFormat)) {
$time = explode(':', $days[1]);
- if (($time[0] > 12) && $timeFormat == '12') {
- $time[0] = $time[0] - 12;
- $meridian = 'pm';
- } elseif ($time[0] == '12' && $timeFormat == '12') {
+ if ($time[0] >= '12' && $timeFormat == '12') {
$meridian = 'pm';
} elseif ($time[0] == '00' && $timeFormat == '12') {
$time[0] = 12;
Please sign in to comment.
Something went wrong with that request. Please try again.