From cc4673ff7e173297876ee63941e464a9c2327268 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Tue, 7 Oct 2008 03:55:43 +0000 Subject: [PATCH] Added get data to a form submission of SearchForm/search, so that ResultAssembly is passed git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63733 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/ModelAdmin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php index a5075120..fb48e4cb 100644 --- a/code/ModelAdmin.php +++ b/code/ModelAdmin.php @@ -497,7 +497,7 @@ class ModelAdmin_CollectionController extends Controller { */ function search($request, $form) { // Get the results form to be rendered - $resultsForm = $this->ResultsForm($form->getData()); + $resultsForm = $this->ResultsForm(array_merge($form->getData(), $request)); // Before rendering, let's get the total number of results returned $tableField = $resultsForm->Fields()->fieldByName($this->modelClass); $numResults = $tableField->TotalCount(); @@ -554,6 +554,7 @@ class ModelAdmin_CollectionController extends Controller { $tf->setShowPagination(true); // @todo Remove records that can't be viewed by the current user $tf->setPermissions(array_merge(array('view','export'), TableListField::permissions_for_object($this->modelClass))); + $url = 'Link() . '/$ID/edit\">$value'; $tf->setFieldFormatting(array_combine(array_keys($summaryFields), array_fill(0,count($summaryFields), $url)));