php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-04 06:37:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #14230: Fixed itemsOptions ignored in checkBoxList

Browse Source
This commit is contained in:
Evgeniy Moiseenko
2018-09-19 17:39:21 +03:00
committed by Alexander Makarov
parent 421bd96e99
commit a8bfe8bbe6
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -4,6 +4,7 @@ Yii Framework 2 Change Log
2.0.16 under development 2.0.16 under development
------------------------ ------------------------
- Bug #14230: Fixed `itemsOptions` ignored in `checkBoxList` (s1lver)
- Bug #14368: Added `role` attribute for active radio list (s1lver) - Bug #14368: Added `role` attribute for active radio list (s1lver)
- Bug #16680: Fixed ActiveField 'text' input with maxlength (s1lver) - Bug #16680: Fixed ActiveField 'text' input with maxlength (s1lver)
- Bug #5341: HasMany via two relations (shirase, cebe) - Bug #5341: HasMany via two relations (shirase, cebe)

4
framework/helpers/BaseHtml.php
View File

@ -958,10 +958,10 @@ class BaseHtml
if ($formatter !== null) { if ($formatter !== null) {
$lines[] = call_user_func($formatter, $index, $label, $name, $checked, $value); $lines[] = call_user_func($formatter, $index, $label, $name, $checked, $value);
} else { } else {
$lines[] = static::checkbox($name, $checked, array_merge($itemOptions, [ $lines[] = static::checkbox($name, $checked, array_merge([
'value' => $value, 'value' => $value,
'label' => $encode ? static::encode($label) : $label, 'label' => $encode ? static::encode($label) : $label,
])); ], $itemOptions));
} }
$index++; $index++;
} }

11
tests/framework/helpers/HtmlTest.php
View File

@ -714,6 +714,17 @@ EOD;
EOD; EOD;
$this->assertEqualsWithoutLE($expected, Html::checkboxList('test', ['1', 'value3'], $this->getDataItems3())); $this->assertEqualsWithoutLE($expected, Html::checkboxList('test', ['1', 'value3'], $this->getDataItems3()));
$this->assertEqualsWithoutLE($expected, Html::checkboxList('test', new \ArrayObject(['1', 'value3']), $this->getDataItems3())); $this->assertEqualsWithoutLE($expected, Html::checkboxList('test', new \ArrayObject(['1', 'value3']), $this->getDataItems3()));
$expected = <<<'EOD'
<div><label><input type="checkbox" name="test[]" value="0"> Test Label</label>
<label><input type="checkbox" name="test[]" value="0"> Test Label</label></div>
EOD;
$this->assertEqualsWithoutLE($expected, Html::checkboxList('test', null, $this->getDataItems(), [
'itemOptions' => [
'value' => 0,
'label' => 'Test Label'
]
]));
} }
public function testRadioList() public function testRadioList()