mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-02 22:28:38 +02:00
BUGFIX: Fixed report pagination, with or without search params (from r95555)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98168 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
5fdc153a19
commit
61a0240a54
@ -205,7 +205,15 @@ class ReportAdmin extends LeftAndMain {
|
|||||||
|
|
||||||
$form = new Form($this, 'EditForm', $fields, $actions);
|
$form = new Form($this, 'EditForm', $fields, $actions);
|
||||||
|
|
||||||
$form->loadDataFrom($_REQUEST);
|
$form->loadDataFrom($_GET);
|
||||||
|
|
||||||
|
// Include search criteria in the form action so that pagination works
|
||||||
|
$filteredCriteria = array_merge($_GET, $_POST);
|
||||||
|
foreach(array('ID','url','ajax','ctf','update','action_updatereport','SecurityID') as $notAParam) {
|
||||||
|
unset($filteredCriteria[$notAParam]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$form->setFormAction($this->Link() . '/EditForm?' . http_build_query($filteredCriteria));
|
||||||
|
|
||||||
return $form;
|
return $form;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user