tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 15:05:42 +00:00
Code Issues Projects Releases Wiki Activity

FIX: fix submissions grid field in 3.0 versions (#96, #100)

Browse Source
This commit is contained in:
Will Rossiter 2013-03-16 12:18:51 +13:00
parent 5d3d3e1b00
commit 416a5b8864
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/UserFormsGridFieldFilterHeader.php
View File

@ -34,10 +34,10 @@ class UserFormsGridFieldFilterHeader extends GridFieldFilterHeader {
// retrieve a list of all the available form fields that have been // retrieve a list of all the available form fields that have been
// submitted in this form. // submitted in this form.
$params = $gridField->getForm()->getController()->getURLParams();
$formFields = SubmittedFormField::get() $formFields = SubmittedFormField::get()
->filter(array( ->where(sprintf("SubmittedForm.ParentID = '%s'", Convert::raw2sql($params['ID'])))
"SubmittedForm.ParentID" => $gridField->getList()->column()
))
->leftJoin('SubmittedForm', 'SubmittedFormField.ParentID = SubmittedForm.ID') ->leftJoin('SubmittedForm', 'SubmittedFormField.ParentID = SubmittedForm.ID')
->sort('Title', 'ASC') ->sort('Title', 'ASC')
->map('Name', 'Title'); ->map('Name', 'Title');

4
code/model/UserDefinedForm.php
View File

@ -118,9 +118,7 @@ class UserDefinedForm extends Page {
// attach every column to the print view from // attach every column to the print view from
$columns = SubmittedFormField::get() $columns = SubmittedFormField::get()
->filter(array( ->where("SubmittedForm.ParentID = '$this->ID'")
"SubmittedForm.ParentID" => $this->ID
))
->leftJoin('SubmittedForm', 'SubmittedFormField.ParentID = SubmittedForm.ID') ->leftJoin('SubmittedForm', 'SubmittedFormField.ParentID = SubmittedForm.ID')
->map('Name', 'Title'); ->map('Name', 'Title');

2
composer.json
View File

@ -9,6 +9,6 @@
"email": "will@fullscreen.io" "email": "will@fullscreen.io"
}], }],
"require": { "require": {
"silverstripe/framework": ">=3.1.*@dev" "silverstripe/framework": "3.*"
} }
} }