PATCH: ensure that composite and nested form fields can be included
This commit is contained in:
parent
0cb265434a
commit
096064486d
|
@ -307,14 +307,21 @@ class Report extends ViewableData
|
||||||
|
|
||||||
// Add search fields is available
|
// Add search fields is available
|
||||||
if ($this->hasMethod('parameterFields') && $parameterFields = $this->parameterFields()) {
|
if ($this->hasMethod('parameterFields') && $parameterFields = $this->parameterFields()) {
|
||||||
/** @var FormField $field */
|
|
||||||
foreach ($parameterFields as $field) {
|
//standardise fields with filter[name] and .no-change-track
|
||||||
// Namespace fields for easier handling in form submissions
|
$parameterFields->recursiveWalk(
|
||||||
$field->setName(sprintf('filters[%s]', $field->getName()));
|
function(FormField $field) {
|
||||||
$field->addExtraClass('no-change-track'); // ignore in changetracker
|
if(strpos($field->getName(), 'filter[') !== 0) {
|
||||||
|
$field->setName(sprintf('filters[%s]', $field->getName()));
|
||||||
|
}
|
||||||
|
$field->addExtraClass('no-change-track'); // ignore in changetracker
|
||||||
|
}
|
||||||
|
);
|
||||||
|
// add fields
|
||||||
|
foreach($parameterFields as $field) {
|
||||||
$fields->push($field);
|
$fields->push($field);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add a search button
|
// Add a search button
|
||||||
$formAction = FormAction::create('updatereport', _t('SilverStripe\\Forms\\GridField\\GridField.Filter', 'Filter'));
|
$formAction = FormAction::create('updatereport', _t('SilverStripe\\Forms\\GridField\\GridField.Filter', 'Filter'));
|
||||||
$formAction->addExtraClass('btn-primary mb-4');
|
$formAction->addExtraClass('btn-primary mb-4');
|
||||||
|
|
Loading…
Reference in New Issue