tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUG Fixed escaping of name/value in options of form fields 

DropdownField was currently escaping options, but CheckboxSetField and
OptionsetField were not. This fixes them to be consistent.
This commit is contained in:
Sean Harvey 2014-08-04 09:28:49 +12:00
parent 441a0c03f7
commit b2dac644a0
6 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/forms/CheckboxSetField.ss
View File

@ -2,8 +2,8 @@
<% if $Options.Count %>
<% loop $Options %>
<li class="$Class">
<input id="$ID" class="checkbox" name="$Name" type="checkbox" value="$Value"<% if $isChecked %> checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> />
<label for="$ID">$Title</label>
<input id="$ID" class="checkbox" name="$Name.XML" type="checkbox" value="$Value.ATT"<% if $isChecked %> checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> />
<label for="$ID">$Title.XML</label>
</li>
<% end_loop %>
<% else %>

2
templates/forms/DropdownField.ss
View File

@ -1,5 +1,5 @@
<select $AttributesHTML>
<% loop $Options %>
<option value="$Value.XML"<% if $Selected %> selected="selected"<% end_if %><% if $Disabled %> disabled="disabled"<% end_if %>>$Title.XML</option>
<option value="$Value.ATT"<% if $Selected %> selected="selected"<% end_if %><% if $Disabled %> disabled="disabled"<% end_if %>>$Title.XML</option>
<% end_loop %>
</select>

4
templates/forms/OptionsetField.ss
View File

@ -1,8 +1,8 @@
<ul id="$ID" class="$extraClass">
<% loop $Options %>
<li class="$Class">
<input id="$ID" class="radio" name="$Name" type="radio" value="$Value"<% if $isChecked %> checked<% end_if %><% if $isDisabled %> disabled<% end_if %> />
<label for="$ID">$Title</label>
<input id="$ID" class="radio" name="$Name.ATT" type="radio" value="$Value.ATT"<% if $isChecked %> checked<% end_if %><% if $isDisabled %> disabled<% end_if %> />
<label for="$ID">$Title.XML</label>
</li>
<% end_loop %>
</ul>

11
tests/forms/CheckboxSetFieldTest.php
View File

@ -144,6 +144,17 @@ class CheckboxSetFieldTest extends SapphireTest {
$this->assertEquals('Test,Another', $dbValue);
}
public function testEscapedOptions() {
$field = new CheckboxSetField('Content', 'Content', array(
'Test' => 'Test',
'Another<weirdvalue>' => 'Another',
));
$html = $field->Field();
$this->assertContains('Content[Another&lt;weirdvalue&gt;]', $html, 'Option name is escaped');
$this->assertContains('value="Another&lt;weirdvalue&gt;', $html, 'Option value is escaped');
}
}
/**

14
tests/forms/DropdownFieldTest.php
View File

@ -208,7 +208,17 @@ class DropdownFieldTest extends SapphireTest {
$disabledOptions = $this->findDisabledOptionElements($field->Field());
$this->assertEquals(count($disabledOptions), 0, 'There are no disabled options');
}
public function testEscapedOptions() {
$field = new DropdownField('Content', 'Content', array(
'Test' => 'Test',
'Another<weirdvalue>' => 'Another',
));
$html = $field->Field();
$this->assertContains('value="Another&lt;weirdvalue&gt;', $html, 'Option value is escaped');
}
/**
* Create a test dropdown field, with the option to
* set what source and blank value it should contain
@ -293,4 +303,4 @@ class DropdownFieldTest extends SapphireTest {
return $foundDisabled;
}
}
}

11
tests/forms/OptionsetFieldTest.php
View File

@ -34,4 +34,15 @@ class OptionsetFieldTest extends SapphireTest {
preg_match('/Yes/', $field->Field(), $matches);
$this->assertEquals($matches[0], 'Yes');
}
public function testEscapedOptions() {
$field = new OptionsetField('Content', 'Content', array(
'Test' => 'Test',
'Another<weirdvalue>' => 'Another',
));
$html = $field->Field();
$this->assertContains('value="Another&lt;weirdvalue&gt;', $html, 'Option value is escaped');
}
}