adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 11:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2744 from wnasich/fix_html5_attribute_step

Browse source 
Rendering a proper value for html5 attribute 'step'
This commit is contained in:
Mark Story 2014-01-30 15:04:17 -08:00
commit 0906dec3c4
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
View file

@ -353,6 +353,8 @@ class ValidateUser extends CakeTestModel {
'email' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'), 'email' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
'balance' => array('type' => 'float', 'null' => false, 'length' => '5,2'), 'balance' => array('type' => 'float', 'null' => false, 'length' => '5,2'),
'cost_decimal' => array('type' => 'decimal', 'null' => false, 'length' => '6,3'), 'cost_decimal' => array('type' => 'decimal', 'null' => false, 'length' => '6,3'),
'ratio' => array('type' => 'decimal', 'null' => false, 'length' => '10,6'),
'population' => array('type' => 'decimal', 'null' => false, 'length' => '15,0'),
'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''), 'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null) 'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
); );
@ -1916,6 +1918,28 @@ class FormHelperTest extends CakeTestCase {
); );
$this->assertTags($result, $expected); $this->assertTags($result, $expected);
$result = $this->Form->input('ValidateUser.ratio');
$expected = array(
'div' => array('class'),
'label' => array('for'),
'Ratio',
'/label',
'input' => array('name', 'type' => 'number', 'step' => '0.000001', 'id'),
'/div',
);
$this->assertTags($result, $expected);
$result = $this->Form->input('ValidateUser.population');
$expected = array(
'div' => array('class'),
'label' => array('for'),
'Population',
'/label',
'input' => array('name', 'type' => 'number', 'step' => '1', 'id'),
'/div',
);
$this->assertTags($result, $expected);
$result = $this->Form->input('Contact.email', array('id' => 'custom')); $result = $this->Form->input('Contact.email', array('id' => 'custom'));
$expected = array( $expected = array(
'div' => array('class' => 'input email'), 'div' => array('class' => 'input email'),

3
lib/Cake/View/Helper/FormHelper.php
View file

@ -1173,7 +1173,8 @@ class FormHelper extends AppHelper {
!isset($options['step']) !isset($options['step'])
) { ) {
if ($type === 'decimal') { if ($type === 'decimal') {
$options['step'] = pow(10, -1 * substr($fieldDef['length'], strpos($fieldDef['length'], ',') + 1)); $decimalPlaces = substr($fieldDef['length'], strpos($fieldDef['length'], ',') + 1);
$options['step'] = sprintf('%.' . $decimalPlaces . 'F', pow(10, -1 * $decimalPlaces));
} elseif ($type === 'float') { } elseif ($type === 'float') {
$options['step'] = 'any'; $options['step'] = 'any';
} }