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

Merge branch '4.0' into 4.1

Browse Source
This commit is contained in:
Robbie Averill 2019-04-11 11:36:40 +12:00
commit f4a6115ee6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Forms/GridField/GridFieldLevelup.php
View File

@ -86,7 +86,7 @@ class GridFieldLevelup implements GridField_HTMLProvider
)); ));
$template = SSViewer::get_templates_by_class($this, '', __CLASS__); $template = SSViewer::get_templates_by_class($this, '', __CLASS__);
return array( return array(
'before' => $forTemplate->renderWith($template), 'before' => $forTemplate->renderWith($template),
); );
} }

3
src/ORM/FieldType/DBForeignKey.php
View File

@ -55,6 +55,9 @@ class DBForeignKey extends DBInt
if ($hasOneSingleton instanceof Image) { if ($hasOneSingleton instanceof Image) {
$field->setAllowedFileCategories('image/supported'); $field->setAllowedFileCategories('image/supported');
} }
if ($field->hasMethod('setAllowedMaxFileNumber')) {
$field->setAllowedMaxFileNumber(1);
}
return $field; return $field;
} }