Merge pull request #1347 from stojg/gridfieldfilterheader-last-filter-only

BUG: GridFieldFilterHeader only filters on last filter
This commit is contained in:
Sam Minnée 2013-04-08 15:16:33 -07:00
commit ff2f75535b

View File

@ -92,13 +92,13 @@ class GridFieldFilterHeader implements GridField_HTMLProvider, GridField_DataMan
}
$filterArguments = $state->Columns->toArray();
$dataListClone = null;
$dataListClone = clone($dataList);
foreach($filterArguments as $columnName => $value ) {
if($dataList->canFilterBy($columnName) && $value) {
$dataListClone = $dataList->filter($columnName.':PartialMatch', $value);
$dataListClone = $dataListClone->filter($columnName.':PartialMatch', $value);
}
}
return ($dataListClone) ? $dataListClone : $dataList;
return $dataListClone;
}
public function getHTMLFragments($gridField) {