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

Merge pull request #172 from halkyon/performance_improvements

Browse Source 
BUG Performance improvements of SubmittedFormField queries.
This commit is contained in:
Will Rossiter 2013-11-12 21:51:09 -08:00
commit ab6e0970b7
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
code/UserFormsGridFieldFilterHeader.php
View File

@ -9,6 +9,16 @@
*/ */
class UserFormsGridFieldFilterHeader extends GridFieldFilterHeader { class UserFormsGridFieldFilterHeader extends GridFieldFilterHeader {
/**
* A map of name => value of columns from all submissions
* @var array
*/
protected $columns;
public function setColumns($columns) {
$this->columns = $columns;
}
public function handleAction(GridField $gridField, $actionName, $arguments, $data) { public function handleAction(GridField $gridField, $actionName, $arguments, $data) {
if(!$this->checkDataType($gridField->getList())) { if(!$this->checkDataType($gridField->getList())) {
return; return;
@ -36,18 +46,10 @@ class UserFormsGridFieldFilterHeader extends GridFieldFilterHeader {
// submitted in this form. // submitted in this form.
$params = $gridField->getForm()->getController()->getURLParams(); $params = $gridField->getForm()->getController()->getURLParams();
// this is for you SQL server I know you don't see '' as a number
$parentID = (!empty($params['ID'])) ? Convert::raw2sql($params['ID']) : 0;
$formFields = SubmittedFormField::get()
->where(sprintf("SubmittedForm.ParentID = '%s'", $parentID))
->leftJoin('SubmittedForm', 'SubmittedFormField.ParentID = SubmittedForm.ID')
->sort('Title', 'ASC')
->map('Name', 'Title');
// show dropdown of all the fields available from the submitted form fields // show dropdown of all the fields available from the submitted form fields
// that have been saved. Takes the titles from the currently live form. // that have been saved. Takes the titles from the currently live form.
$columnField = new DropdownField('FieldNameFilter', ''); $columnField = new DropdownField('FieldNameFilter', '');
$columnField->setSource($formFields->toArray()); $columnField->setSource($this->columns);
$columnField->setEmptyString(_t('UserFormsGridFieldFilterHeader.FILTERSUBMISSIONS', 'Filter Submissions..')); $columnField->setEmptyString(_t('UserFormsGridFieldFilterHeader.FILTERSUBMISSIONS', 'Filter Submissions..'));
$columnField->setHasEmptyDefault(true); $columnField->setHasEmptyDefault(true);
$columnField->setValue($selectedField); $columnField->setValue($selectedField);

27
code/model/UserDefinedForm.php
View File

@ -62,7 +62,6 @@ class UserDefinedForm extends Page {
SiteTree::disableCMSFieldsExtensions(); SiteTree::disableCMSFieldsExtensions();
$fields = parent::getCMSFields(); $fields = parent::getCMSFields();
SiteTree::enableCMSFieldsExtensions(); SiteTree::enableCMSFieldsExtensions();
// define tabs // define tabs
$fields->findOrMakeTab('Root.FormContent', _t('UserDefinedForm.FORM', 'Form')); $fields->findOrMakeTab('Root.FormContent', _t('UserDefinedForm.FORM', 'Form'));
$fields->findOrMakeTab('Root.FormOptions', _t('UserDefinedForm.CONFIGURATION', 'Configuration')); $fields->findOrMakeTab('Root.FormOptions', _t('UserDefinedForm.CONFIGURATION', 'Configuration'));
@ -111,6 +110,19 @@ class UserDefinedForm extends Page {
$this->Submissions()->sort('Created', 'DESC') $this->Submissions()->sort('Created', 'DESC')
); );
// make sure a numeric not a empty string is checked against this int column for SQL server
$parentID = (!empty($this->ID)) ? $this->ID : 0;
// get a list of all field names and values used for print and export CSV views of the GridField below.
$columnSQL = <<<SQL
SELECT "Name", "Title"
FROM "SubmittedFormField"
LEFT JOIN "SubmittedForm" ON "SubmittedForm"."ID" = "SubmittedFormField"."ParentID"
WHERE "SubmittedForm"."ParentID" = '$parentID'
ORDER BY "Title" ASC
SQL;
$columns = DB::query($columnSQL)->map();
$config = new GridFieldConfig(); $config = new GridFieldConfig();
$config->addComponent(new GridFieldToolbarHeader()); $config->addComponent(new GridFieldToolbarHeader());
$config->addComponent($sort = new GridFieldSortableHeader()); $config->addComponent($sort = new GridFieldSortableHeader());
@ -129,16 +141,9 @@ class UserDefinedForm extends Page {
$filter->setThrowExceptionOnBadDataType(false); $filter->setThrowExceptionOnBadDataType(false);
$pagination->setThrowExceptionOnBadDataType(false); $pagination->setThrowExceptionOnBadDataType(false);
// make sure a numeric not a empty string is checked against this int column for SQL server // attach every column to the print view form
$parentID = (!empty($this->ID)) ? $this->ID : 0; $columns['Created'] = 'Created';
// attach every column to the print view from $filter->setColumns($columns);
$columns = SubmittedFormField::get()
->where("\"SubmittedForm\".\"ParentID\" = '$parentID'")
->leftJoin('SubmittedForm', '"SubmittedFormField"."ParentID" = "SubmittedForm"."ID"')
->map('Name', 'Title');
$columns = $columns->toArray();
$columns['Created'] = "Created";
// print configuration // print configuration
$print->setPrintHasHeader(true); $print->setPrintHasHeader(true);