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 pull request #132 from Focus-Flow/bug/quotes-in-editableoption-title

Browse Source 
BUG: support quotes in EditableOption Title
This commit is contained in:
Will Rossiter 2013-06-04 02:52:18 -07:00
commit 3352fe38b0
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/model/formfields/EditableCheckboxGroupField.php
View File

@ -16,9 +16,9 @@ class EditableCheckboxGroupField extends EditableMultipleOptionField {
public function getFormField() { public function getFormField() {
$optionSet = $this->Options(); $optionSet = $this->Options();
$options = array(); $options = array();
$optionMap = ($optionSet) ? $optionSet->map('Title', 'Title') : array(); $optionMap = ($optionSet) ? $optionSet->map('EscapedTitle', 'Title') : array();
return new CheckboxSetField($this->Name, $this->Title, $optionMap); return new CheckboxSetField($this->Name, $this->Title, $optionMap);
} }
@ -40,4 +40,4 @@ class EditableCheckboxGroupField extends EditableMultipleOptionField {
} }
return $result; return $result;
} }
} }

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

@ -70,4 +70,8 @@ class EditableOption extends DataObject {
$this->readonly = true; $this->readonly = true;
return $this->EditSegment(); return $this->EditSegment();
} }
}
public function getEscapedTitle() {
return Convert::raw2att($this->Title);
}
}

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

@ -19,7 +19,7 @@ class EditableRadioField extends EditableMultipleOptionField {
if($optionSet) { if($optionSet) {
foreach( $optionSet as $option ) { foreach( $optionSet as $option ) {
$options[$option->Title] = $option->Title; $options[$option->EscapedTitle] = $option->Title;
} }
} }