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

FIX use the correct method for CSV exports and include the full file path

Browse Source
This commit is contained in:
Franco Springveldt 2017-06-27 11:03:32 +12:00
parent e86306c7bf
commit 1e1b596739
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/model/submissions/SubmittedFileField.php
View File

@ -55,7 +55,7 @@ class SubmittedFileField extends SubmittedFormField
{ {
if ($file = $this->UploadedFile()) { if ($file = $this->UploadedFile()) {
if (trim($file->getFilename(), '/') != trim(ASSETS_DIR, '/')) { if (trim($file->getFilename(), '/') != trim(ASSETS_DIR, '/')) {
return $this->UploadedFile()->URL; return $this->UploadedFile()->AbsoluteLink();
} }
} }
} }

7
code/model/submissions/SubmittedForm.php
View File

@ -65,9 +65,14 @@ class SubmittedForm extends DataObject
$self->Values()->sort('Created', 'ASC') $self->Values()->sort('Created', 'ASC')
); );
$exportColumns = array(
'Title' => 'Title',
'ExportValue' => 'Value'
);
$config = new GridFieldConfig(); $config = new GridFieldConfig();
$config->addComponent(new GridFieldDataColumns()); $config->addComponent(new GridFieldDataColumns());
$config->addComponent(new GridFieldExportButton()); $config->addComponent(new GridFieldExportButton('after', $exportColumns));
$config->addComponent(new GridFieldPrintButton()); $config->addComponent(new GridFieldPrintButton());
$values->setConfig($config); $values->setConfig($config);