Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Form] apply automatically step=1 for datetime-local input #36523

Merged
merged 1 commit into from Apr 23, 2020
Merged

[Form] apply automatically step=1 for datetime-local input #36523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
View file
Open in desktop
Expand Up @@ -203,6 +203,14 @@ public function buildView(FormView $view, FormInterface $form, array $options)
// * the html5 is set to true
if ($options['html5'] && 'single_text' === $options['widget'] && self::HTML5_FORMAT === $options['format']) {
$view->vars['type'] = 'datetime-local';

// we need to force the browser to display the seconds by
// adding the HTML attribute step if not already defined.
// Otherwise the browser will not display and so not send the seconds
// therefore the value will always be considered as invalid.
if ($options['with_seconds'] && !isset($view->vars['attr']['step'])) {
$view->vars['attr']['step'] = 1;
}
}
}

Expand Down
31 changes: 31 additions & 0 deletions src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
View file
Open in desktop
Expand Up @@ -444,6 +444,37 @@ public function testDontPassHtml5TypeIfNotSingleText()
$this->assertArrayNotHasKey('type', $view->vars);
}

public function testSingleTextWidgetWithSecondsShouldHaveRightStepAttribute()
{
$view = $this->factory
->create(static::TESTED_TYPE, null, [
'widget' => 'single_text',
'with_seconds' => true,
])
->createView()
;

$this->assertArrayHasKey('step', $view->vars['attr']);
$this->assertEquals(1, $view->vars['attr']['step']);
}

public function testSingleTextWidgetWithSecondsShouldNotOverrideStepAttribute()
{
$view = $this->factory
->create(static::TESTED_TYPE, null, [
'widget' => 'single_text',
'with_seconds' => true,
'attr' => [
'step' => 30,
],
])
->createView()
;

$this->assertArrayHasKey('step', $view->vars['attr']);
$this->assertEquals(30, $view->vars['attr']['step']);
}

public function testDateTypeChoiceErrorsBubbleUp()
{
$error = new FormError('Invalid!');
Expand Down