Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
BUGFIX: open ticket 7603 fixing search filtering - thought I should i…
…nitialise $dataListClone
  • Loading branch information
Jeremy Bridson committed Jul 10, 2012
1 parent 630ab87 commit e096c29
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
13 changes: 8 additions & 5 deletions forms/HtmlEditorField.php
Expand Up @@ -362,11 +362,14 @@ function MediaForm() {
// TODO Handle through GridState within field - currently this state set too late to be useful here (during request handling) // TODO Handle through GridState within field - currently this state set too late to be useful here (during request handling)
$parentID = $this->controller->getRequest()->requestVar('ParentID'); $parentID = $this->controller->getRequest()->requestVar('ParentID');


$fileFieldConfig = GridFieldConfig::create(); $fileFieldConfig = GridFieldConfig::create()->addComponents(
$fileFieldConfig->addComponent(new GridFieldSortableHeader()); new GridFieldFilterHeader(),
$fileFieldConfig->addComponent(new GridFieldFilterHeader()); new GridFieldSortableHeader(),
$fileFieldConfig->addComponent(new GridFieldDataColumns()); new GridFieldDataColumns(),
$fileFieldConfig->addComponent(new GridFieldPaginator(5)); new GridFieldPaginator(5),
new GridFieldDeleteAction(),
new GridFieldDetailForm()
);
$fileField = new GridField('Files', false, null, $fileFieldConfig); $fileField = new GridField('Files', false, null, $fileFieldConfig);
$fileField->setList($this->getFiles($parentID)); $fileField->setList($this->getFiles($parentID));
$fileField->setAttribute('data-selectable', true); $fileField->setAttribute('data-selectable', true);
Expand Down
5 changes: 3 additions & 2 deletions forms/gridfield/GridFieldFilterHeader.php
Expand Up @@ -91,12 +91,13 @@ public function getManipulatedData(GridField $gridField, SS_List $dataList) {
} }


$filterArguments = $state->Columns->toArray(); $filterArguments = $state->Columns->toArray();
$dataListClone = null;
foreach($filterArguments as $columnName => $value ) { foreach($filterArguments as $columnName => $value ) {
if($dataList->canFilterBy($columnName) && $value) { if($dataList->canFilterBy($columnName) && $value) {
$dataList->filter($columnName.':PartialMatch', $value); $dataListClone = $dataList->filter($columnName.':PartialMatch', $value);
} }
} }
return $dataList; return ($dataListClone) ? $dataListClone : $dataList;
} }


public function getHTMLFragments($gridField) { public function getHTMLFragments($gridField) {
Expand Down

0 comments on commit e096c29

Please sign in to comment.