Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1381140 by Lendude, himanshu-dixit, tameeshb, babruix, IRuslan, sun, blazey, esoteric1, mkalkbrenner, ceardach, dcam, bapi_22, dan2k3k4, tim.plunkett, Pavan B S, tanmayk, lomasr, xjm, andypost: A #default_value = 0 for #type radios checks all radios

8.5.x
Nathaniel Catchpole 2017-09-12 10:46:29 +01:00
parent 932db614e6
commit a05469232d
4 changed files with 211 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/lib/Drupal/Core/Render/Element/Radio.php
View File

@ -54,7 +54,18 @@ class Radio extends FormElement {
$element['#attributes']['type'] = 'radio';
Element::setAttributes($element, ['id', 'name', '#return_value' => 'value']);
if (isset($element['#return_value']) && $element['#value'] !== FALSE && $element['#value'] == $element['#return_value']) {
// To avoid auto-casting during '==' we convert $element['#value'] and
// $element['#return_value'] to strings. It will prevent wrong true-checking
// for both cases: 0 == 'string' and 'string' == 0, this will occur because
// all numeric array values will be integers and all submitted values will
// be strings. Array values are never valid for radios and are skipped. To
// account for FALSE and empty string values in the #return_value, we will
// consider any #value that evaluates to empty to be the same as any
// #return_value that evaluates to empty.
if (isset($element['#return_value']) &&
$element['#value'] !== FALSE &&
!is_array($element['#value']) &&
((empty($element['#value']) && empty($element['#return_value'])) || (string) $element['#value'] === (string) $element['#return_value'])) {
$element['#attributes']['checked'] = 'checked';
}
static::setAttributes($element, ['form-radio']);

8
core/modules/system/tests/modules/form_test/form_test.routing.yml
View File

@ -294,6 +294,14 @@ form_test.checkboxes_radios:
requirements:
_access: 'TRUE'
form_test.radios_checked:
path: '/form-test/radios-checked'
defaults:
_form: '\Drupal\form_test\Form\FormTestRadiosCheckedForm'
_title: 'Radios checked defalt value'
requirements:
_access: 'TRUE'
form_test.email:
path: '/form-test/email'
defaults:

151
core/modules/system/tests/modules/form_test/src/Form/FormTestRadiosCheckedForm.php Normal file
View File

@ -0,0 +1,151 @@
<?php
namespace Drupal\form_test\Form;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
/**
* Form constructor to test #default_value settings of radios.
*/
class FormTestRadiosCheckedForm extends FormBase {
/**
* {@inheritdoc}
*/
public function getFormId() {
return 'form_test_radios_checked';
}
/**
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state) {
$form['radios'] = [
'#type' => 'radios',
'#title' => 'Radios',
'#options' => [
0 => 'Zero',
'foo' => 'Foo',
1 => 'One',
'bar' => '<em>Bar - radios</em>',
'>' => "<em>Special Char</em><script>alert('radios');</script>",
],
'#default_value' => 0,
];
$form['radios-string'] = [
'#type' => 'radios',
'#title' => 'Radios',
'#options' => [
0 => 'Zero',
'foo' => 'Foo',
1 => 'One',
'bar' => '<em>Bar - radios</em>',
'>' => "<em>Special Char</em><script>alert('radios');</script>",
],
'#default_value' => 'bar',
];
$form['radios-boolean-true'] = [
'#type' => 'radios',
'#title' => 'Radios',
'#options' => [
'All' => '- Any -',
1 => 'True',
0 => 'False',
],
'#default_value' => TRUE,
];
$form['radios-boolean-false'] = [
'#type' => 'radios',
'#title' => 'Radios',
'#options' => [
'All' => '- Any -',
1 => 'True',
0 => 'False',
],
'#default_value' => FALSE,
];
$form['radios-boolean-any'] = [
'#type' => 'radios',
'#title' => 'Radios',
'#options' => [
'All' => '- Any -',
1 => 'True',
0 => 'False',
],
'#default_value' => 'All',
];
$form['radios-string-zero'] = [
'#type' => 'radios',
'#title' => 'Radios',
'#options' => [
'All' => '- Any -',
'0' => 'Zero',
100 => 'One hundred',
],
'#default_value' => 0,
];
$form['radios-int-non-zero'] = [
'#type' => 'radios',
'#title' => 'Radios',
'#options' => [
'All' => '- Any -',
0 => 'Zero',
10 => 'Ten',
100 => 'One hundred',
],
'#default_value' => 10,
];
$form['radios-int-non-zero-as-string'] = [
'#type' => 'radios',
'#title' => 'Radios',
'#options' => [
'All' => '- Any -',
'0' => 'Zero',
'10' => 'Ten',
'100' => 'One hundred',
],
'#default_value' => '100',
];
$form['radios-empty-string'] = [
'#type' => 'radios',
'#title' => 'Radios',
'#options' => [
'All' => '- Any -',
0 => 'None',
],
'#default_value' => '',
];
$form['radios-empty-array'] = [
'#type' => 'radios',
'#title' => 'Radios',
'#options' => [
'All' => '- Any -',
0 => 'None',
],
'#default_value' => [],
];
$form['radios-key-FALSE'] = [
'#type' => 'radios',
'#title' => 'Radios',
'#options' => [
'All' => '- Any -',
FALSE => 'False',
],
'#default_value' => '',
];
$form['submit'] = ['#type' => 'submit', '#value' => 'Submit'];
return $form;
}
/**
* {@inheritdoc}
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
$form_state->setResponse(new JsonResponse($form_state->getValues()));
}
}

40
core/modules/system/tests/src/Functional/Form/ElementTest.php
View File

@ -88,6 +88,46 @@ class ElementTest extends BrowserTestBase {
}
}
/**
* Tests correct checked attribute for radios element.
*/
public function testRadiosChecked() {
// Verify that there is only one radio option checked.
$this->drupalGet('form-test/radios-checked');
$elements = $this->xpath('//input[@name="radios" and @checked]');
$this->assertCount(1, $elements);
$this->assertSame('0', $elements[0]->getValue());
$elements = $this->xpath('//input[@name="radios-string" and @checked]');
$this->assertCount(1, $elements);
$this->assertSame('bar', $elements[0]->getValue());
$elements = $this->xpath('//input[@name="radios-boolean-true" and @checked]');
$this->assertCount(1, $elements);
$this->assertSame('1', $elements[0]->getValue());
// A default value of FALSE indicates that nothing is set.
$elements = $this->xpath('//input[@name="radios-boolean-false" and @checked]');
$this->assertCount(0, $elements);
$elements = $this->xpath('//input[@name="radios-boolean-any" and @checked]');
$this->assertCount(1, $elements);
$this->assertSame('All', $elements[0]->getValue());
$elements = $this->xpath('//input[@name="radios-string-zero" and @checked]');
$this->assertCount(1, $elements);
$this->assertSame('0', $elements[0]->getValue());
$elements = $this->xpath('//input[@name="radios-int-non-zero" and @checked]');
$this->assertCount(1, $elements);
$this->assertSame('10', $elements[0]->getValue());
$elements = $this->xpath('//input[@name="radios-int-non-zero-as-string" and @checked]');
$this->assertCount(1, $elements);
$this->assertSame('100', $elements[0]->getValue());
$elements = $this->xpath('//input[@name="radios-empty-string" and @checked]');
$this->assertCount(1, $elements);
$this->assertSame('0', $elements[0]->getValue());
$elements = $this->xpath('//input[@name="radios-empty-array" and @checked]');
$this->assertCount(0, $elements);
$elements = $this->xpath('//input[@name="radios-key-FALSE" and @checked]');
$this->assertCount(1, $elements);
$this->assertSame('0', $elements[0]->getValue());
}
/**
* Tests wrapper ids for checkboxes and radios.
*/