tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX: list only files the autoset relation supports in UploadField

Browse Source 
Otherwise when user selects an object that does not fit the relation,
the system will throw an Exception.
This commit is contained in:
Mateusz Uzdowski 2012-04-20 16:20:00 +12:00
parent 6469d83569
commit fbbdbbcb3b
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
forms/UploadField.php
View File

@ -471,20 +471,10 @@ class UploadField extends FileField {
$fileObject = null;
if ($this->relationAutoSetting) {
// Search for classes that can hold the uploaded files by traversing the relationship.
if ($record->hasMethod($name)) {
$remote = $record->$name();
if ($remote instanceof DataList) {
// has_many or many_many
$desiredClass = $remote->dataClass();
}
else if (is_object($remote)) {
// has_one
$desiredClass = $remote->ClassName;
}
// If we have a specific class, create new object explicitly. Otherwise rely on Upload::load to choose the class.
if (is_string($desiredClass)) $fileObject = Object::create($desiredClass);
// Search for relations that can hold the uploaded files.
if ($relationClass = $this->getRelationAutosetClass()) {
// Create new object explicitly. Otherwise rely on Upload::load to choose the class.
$fileObject = Object::create($relationClass);
}
}
@ -593,6 +583,17 @@ class UploadField extends FileField {
);
}
/**
* Gets the foreign class that needs to be created.
*
* @return string Foreign class name.
*/
public function getRelationAutosetClass() {
$name = $this->getName();
$record = $this->getRecord();
if (isset($name) && isset($record)) return $record->getRelationClass($name);
}
}
/**
@ -917,6 +918,13 @@ class UploadField_SelectHandler extends RequestHandler {
// Create the data source for the list of files within the current directory.
$files = DataList::create('File')->filter('ParentID', $folderID);
// If relation is to be autoset, make sure only objects from related class are listed.
if ($this->parent->relationAutoSetting) {
if ($relationClass = $this->parent->getRelationAutosetClass()) {
$files->filter('ClassName', $relationClass);
}
}
$fileField = new GridField('Files', false, $files, $config);
$fileField->setAttribute('data-selectable', true);
if($this->parent->getConfig('allowedMaxFileNumber') > 1) $fileField->setAttribute('data-multiselect', true);