tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.3' into 4

Browse Source
This commit is contained in:
Robbie Averill 2017-06-13 12:57:46 +12:00
commit 89656e8ac9
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/model/editableformfields/EditableCheckboxGroupField.php
View File

@ -24,7 +24,7 @@ class EditableCheckboxGroupField extends EditableMultipleOptionField
// Set the default checked items // Set the default checked items
$defaultCheckedItems = $this->getDefaultOptions(); $defaultCheckedItems = $this->getDefaultOptions();
if ($defaultCheckedItems->count()) { if ($defaultCheckedItems->count()) {
$field->setDefaultItems($defaultCheckedItems->map('EscapedTitle')->keys()); $field->setDefaultItems($defaultCheckedItems->map('Value')->keys());
} }
$this->doUpdateFormField($field); $this->doUpdateFormField($field);

2
code/model/editableformfields/EditableDropdown.php
View File

@ -62,7 +62,7 @@ class EditableDropdown extends EditableMultipleOptionField
// Set default // Set default
$defaultOption = $this->getDefaultOptions()->first(); $defaultOption = $this->getDefaultOptions()->first();
if ($defaultOption) { if ($defaultOption) {
$field->setValue($defaultOption->EscapedTitle); $field->setValue($defaultOption->Value);
} }
$this->doUpdateFormField($field); $this->doUpdateFormField($field);
return $field; return $field;

6
code/model/editableformfields/EditableOption.php
View File

@ -75,12 +75,16 @@ class EditableOption extends DataObject
return $this->canEdit($member); return $this->canEdit($member);
} }
/**
* @deprecated 5.0 Use "$Title.XML" in templates instead
* @return string
*/
public function getEscapedTitle() public function getEscapedTitle()
{ {
return Convert::raw2att($this->Title); return Convert::raw2att($this->Title);
} }
/** /**
* @param Member $member * @param Member $member
* @return bool * @return bool
*/ */

2
code/model/editableformfields/EditableRadioField.php
View File

@ -34,7 +34,7 @@ class EditableRadioField extends EditableMultipleOptionField
// Set default item // Set default item
$defaultOption = $this->getDefaultOptions()->first(); $defaultOption = $this->getDefaultOptions()->first();
if ($defaultOption) { if ($defaultOption) {
$field->setValue($defaultOption->EscapedTitle); $field->setValue($defaultOption->Value);
} }
$this->doUpdateFormField($field); $this->doUpdateFormField($field);
return $field; return $field;