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

BUGFIX Fixed CMSFileAddController upload in custom folders

Browse Source
This commit is contained in:
Ingo Schommer 2012-03-02 15:43:22 +01:00
parent 467db5146b
commit 7125af918d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/controllers/CMSFileAddController.php
View File

@ -33,13 +33,19 @@ class CMSFileAddController extends AssetAdmin {
$uploadField->removeExtraClass('ss-uploadfield');
$uploadField->setTemplate('AssetUploadField');
if ($folder->exists() && $folder->getFilename()) {
$uploadField->setFolderName($this->currentPage()->getFilename());
// The Upload class expects a folder relative *within* assets/
$path = preg_replace('/^' . ASSETS_DIR . '\//', '', $folder->getFilename());
$uploadField->setFolderName($path);
}
$form = new Form($this, 'getEditForm', new FieldList($uploadField), new FieldList());
$form = new Form(
$this,
'getEditForm',
new FieldList($uploadField, new HiddenField('ID')),
new FieldList()
);
$form->addExtraClass('center cms-edit-form ' . $this->BaseCSSClasses());
$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
$form->Fields()->push(
new LiteralField(
'BackLink',
@ -50,6 +56,7 @@ class CMSFileAddController extends AssetAdmin {
)
)
);
$form->loadDataFrom($folder);
return $form;
}