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 #637 from creative-commoners/pulls/4/remove-ul-from-groups

Browse Source 
ENHANCEMENT removed needless list from CheckboxGroupField and RadioField
This commit is contained in:
sachajudd 2017-07-12 14:22:47 +12:00 committed by GitHub
commit acb6bca887
6 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,8 +18,9 @@ class EditableCheckboxGroupField extends EditableMultipleOptionField
public function getFormField()
{
$field = new UserFormsCheckboxSetField($this->Name, $this->EscapedTitle, $this->getOptionsMap());
$field->setFieldHolderTemplate('UserFormsMultipleOptionField_holder');
$field = UserFormsCheckboxSetField::create($this->Name, $this->EscapedTitle, $this->getOptionsMap())
->setFieldHolderTemplate('UserFormsMultipleOptionField_holder')
->setTemplate('UserFormsCheckboxSetField');
// Set the default checked items
$defaultCheckedItems = $this->getDefaultOptions();

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

@ -28,8 +28,9 @@ class EditableRadioField extends EditableMultipleOptionField
public function getFormField()
{
$field = OptionsetField::create($this->Name, $this->EscapedTitle, $this->getOptionsMap());
$field->setFieldHolderTemplate('UserFormsMultipleOptionField_holder');
$field = OptionsetField::create($this->Name, $this->EscapedTitle, $this->getOptionsMap())
->setFieldHolderTemplate('UserFormsMultipleOptionField_holder')
->setTemplate('UserFormsOptionSetField');
// Set default item
$defaultOption = $this->getDefaultOptions()->first();

7
templates/UserFormsOptionSetField.ss Normal file
View File

@ -0,0 +1,7 @@
<% loop $Options %>
<div class="$Class">
<input id="$ID" class="radio" name="$Name" type="radio" value="$Value.ATT"<% if $isChecked %>
checked<% end_if %><% if $isDisabled %> disabled<% end_if %> <% if $Up.Required %>required<% end_if %> />
<label for="$ID">$Title</label>
</div>
<% end_loop %>

11
templates/forms/UserFormsCheckboxSetField.ss Normal file
View File

@ -0,0 +1,11 @@
<% if $Options.Count %>
<% loop $Options %>
<div class="$Class">
<input id="$ID" class="checkbox" name="$Name" type="checkbox" value="$Value.ATT"<% if $isChecked %>
checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> />
<label for="$ID">$Title</label>
</div>
<% end_loop %>
<% else %>
<p>No options available</p>
<% end_if %>

15
tests/EditableCheckboxGroupFieldTest.php Normal file
View File

@ -0,0 +1,15 @@
<?php
class EditableCheckboxGroupFieldTest extends SapphireTest
{
protected static $fixture_file = 'EditableFormFieldTest.yml';
/**
* Tests that this element is rendered with a custom template
*/
public function testRenderedWithCustomTemplate()
{
$checkboxGroup = $this->objFromFixture('EditableCheckboxGroupField', 'checkbox-group');
$this->assertEquals('UserFormsCheckboxSetField', $checkboxGroup->getFormField()->getTemplate());
}
}

15
tests/EditableRadioFieldTest.php Normal file
View File

@ -0,0 +1,15 @@
<?php
class EditableRadioFieldTest extends SapphireTest
{
protected static $fixture_file = 'EditableFormFieldTest.yml';
/**
* Tests that this element is rendered with a custom template
*/
public function testRenderedWithCustomTemplate()
{
$radio = $this->objFromFixture('EditableRadioField', 'radio-field');
$this->assertEquals('UserFormsOptionSetField', $radio->getFormField()->getTemplate());
}
}