tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FIX: Allow empty checkboxes through setValue(null) (#1392)

Browse Source
This commit is contained in:
Will Rossiter 2014-01-12 17:28:09 +13:00
parent 13bd4e96b1
commit e7266535c5
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
forms/CheckboxSetField.php
View File

@ -90,10 +90,15 @@ class CheckboxSetField extends OptionsetField {
if($values instanceof SS_List || is_array($values)) { if($values instanceof SS_List || is_array($values)) {
$items = $values; $items = $values;
} else { } else {
if($values === null) {
$items = array();
}
else {
$items = explode(',', $values); $items = explode(',', $values);
$items = str_replace('{comma}', ',', $items); $items = str_replace('{comma}', ',', $items);
} }
} }
}
if(is_array($source)) { if(is_array($source)) {
unset($source['']); unset($source['']);

13
tests/forms/CheckboxSetFieldTest.php
View File

@ -1,9 +1,11 @@
<?php <?php
/** /**
* @package framework * @package framework
* @subpackage tests * @subpackage tests
*/ */
class CheckboxSetFieldTest extends SapphireTest { class CheckboxSetFieldTest extends SapphireTest {
protected static $fixture_file = 'CheckboxSetFieldTest.yml'; protected static $fixture_file = 'CheckboxSetFieldTest.yml';
protected $extraDataObjects = array( protected $extraDataObjects = array(
@ -144,7 +146,13 @@ class CheckboxSetFieldTest extends SapphireTest {
} }
/**
* @package framework
* @subpackage tests
*/
class CheckboxSetFieldTest_Article extends DataObject implements TestOnly { class CheckboxSetFieldTest_Article extends DataObject implements TestOnly {
private static $db = array( private static $db = array(
"Content" => "Text", "Content" => "Text",
); );
@ -155,7 +163,12 @@ class CheckboxSetFieldTest_Article extends DataObject implements TestOnly {
} }
/**
* @package framework
* @subpackage tests
*/
class CheckboxSetFieldTest_Tag extends DataObject implements TestOnly { class CheckboxSetFieldTest_Tag extends DataObject implements TestOnly {
private static $belongs_many_many = array( private static $belongs_many_many = array(
'Articles' => 'CheckboxSetFieldTest_Article' 'Articles' => 'CheckboxSetFieldTest_Article'
); );