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

Merge branch '3.4' into 3.5

Browse Source
This commit is contained in:
Daniel Hensby 2016-12-16 15:52:53 +00:00
commit efd8114fd5
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/en/02_Developer_Guides/03_Forms/03_Form_Templates.md
View File

@ -14,7 +14,7 @@ can be rendered out using custom templates using `setTemplate`.
$field = new TextField(..); $field = new TextField(..);
$field->setTemplate('MyCustomTextField'); $field->setTemplate('MyCustomTextField');
Both `MyCustomTemplate.ss` and `MyCustomTextField.ss` should be located in **mysite/templates/Includes/** Both `MyCustomTemplate.ss` and `MyCustomTextField.ss` should be located in **mysite/templates/forms/** or the same directory as the core.
<div class="notice" markdown="1"> <div class="notice" markdown="1">
It's recommended to copy the contents of the template you're going to replace and use that as a start. For instance, if It's recommended to copy the contents of the template you're going to replace and use that as a start. For instance, if
@ -66,4 +66,4 @@ well as the available syntax, see the [Templates](../templates) documentation.
## API Documentation ## API Documentation
* [api:Form] * [api:Form]
* [api:FormField] * [api:FormField]

33
forms/Form.php
View File

@ -1404,6 +1404,7 @@ class Form extends RequestHandler {
if(is_object($data)) $this->record = $data; if(is_object($data)) $this->record = $data;
// dont include fields without data // dont include fields without data
/** @var FormField[] $dataFields */
$dataFields = $this->Fields()->dataFields(); $dataFields = $this->Fields()->dataFields();
if($dataFields) foreach($dataFields as $field) { if($dataFields) foreach($dataFields as $field) {
$name = $field->getName(); $name = $field->getName();
@ -1436,15 +1437,31 @@ class Form extends RequestHandler {
$val = $data[$name]; $val = $data[$name];
} }
// If field is in array-notation we need to access nested data // If field is in array-notation we need to access nested data
else if(strpos($name,'[')) { else if(preg_match_all('/(.*)\[(.*)\]/U', $name, $matches)) {
// First encode data using PHP's method of converting nested arrays to form data //discard first match which is just the whole string
$flatData = urldecode(http_build_query($data)); array_shift($matches);
// Then pull the value out from that flattened string
preg_match('/' . addcslashes($name,'[]') . '=([^&]*)/', $flatData, $matches);
if (isset($matches[1])) { $keys = array_pop($matches);
$exists = true; $name = array_shift($matches);
$val = $matches[1]; $name = array_shift($name);
if (array_key_exists($name, $data)) {
$tmpData = &$data[$name];
// drill down into the data array looking for the corresponding value
foreach ($keys as $arrayKey) {
if ($arrayKey !== '') {
$tmpData = &$tmpData[$arrayKey];
} else {
//empty square brackets means new array
if (is_array($tmpData)) {
$tmpData = array_shift($tmpData);
}
}
}
if ($tmpData) {
$val = $tmpData;
$exists = true;
}
} }
} }
} }

8
tests/forms/FormTest.php
View File

@ -58,10 +58,10 @@ class FormTest extends FunctionalTest {
$form->loadDataFrom($requestData); $form->loadDataFrom($requestData);
$fields = $form->Fields(); $fields = $form->Fields();
$this->assertEquals($fields->fieldByName('key1')->Value(), 'val1'); $this->assertEquals('val1', $fields->fieldByName('key1')->Value());
$this->assertEquals($fields->fieldByName('namespace[key2]')->Value(), 'val2'); $this->assertEquals('val2', $fields->fieldByName('namespace[key2]')->Value());
$this->assertEquals($fields->fieldByName('namespace[key3][key4]')->Value(), 'val4'); $this->assertEquals('val4', $fields->fieldByName('namespace[key3][key4]')->Value());
$this->assertEquals($fields->fieldByName('othernamespace[key5][key6][key7]')->Value(), 'val7'); $this->assertEquals('val7', $fields->fieldByName('othernamespace[key5][key6][key7]')->Value());
} }
public function testSubmitReadonlyFields() { public function testSubmitReadonlyFields() {