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 #458 from dnadesign/master

Browse Source 
Added routing for UserDefinedForm_Controller
This commit is contained in:
Will Rossiter 2016-04-22 12:09:54 +12:00
commit 32ae99112c
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
_config/routes.yml Normal file
View File

@ -0,0 +1,7 @@
---
Name: userformsroutes
After: framework/routes#coreroutes
---
Director:
rules:
'UserDefinedForm_Controller//$Action' : 'UserDefinedForm_Controller'

11
code/model/editableformfields/EditableFileField.php
View File

@ -49,9 +49,14 @@ class EditableFileField extends EditableFormField {
}
public function getFormField() {
$field = FileField::create($this->Name, $this->EscapedTitle)
->setFieldHolderTemplate('UserFormsField_holder')
->setTemplate('UserFormsFileField');
if(isset(Config::inst()->get('EditableFileField', 'use_uploadfield')) && Config::inst()->get('EditableFileField', 'use_uploadfield')) {
$field = Upload::create($this->Name, $this->EscapedTitle)
} else {
$field = FileField::create($this->Name, $this->EscapedTitle)
}
$field->setFieldHolderTemplate('UserFormsField_holder')
->setTemplate('UserFormsFileField');
$field->getValidator()->setAllowedExtensions(
array_diff(