tonyair/silverstripe-dms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-dms synced 2024-06-16 01:31:39 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.0'

Browse Source
This commit is contained in:
Robbie Averill 2017-07-27 14:19:32 +12:00
commit f9f56b0ef2
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_config/config.yml
View File

@ -10,3 +10,7 @@ SiteTree:
HtmlEditorField_Toolbar: HtmlEditorField_Toolbar:
extensions: extensions:
- DocumentHtmlEditorFieldToolbar - DocumentHtmlEditorFieldToolbar
# Ensure that if the parent UploadField is overloaded with the injector, that the DMSUploadField is returned
Injector:
DMSUploadField: DMSUploadField

2
composer.json
View File

@ -11,7 +11,7 @@
"require": { "require": {
"silverstripe/framework": "^3.5", "silverstripe/framework": "^3.5",
"silverstripe/cms": "^3.5", "silverstripe/cms": "^3.5",
"silverstripe-australia/gridfieldextensions": "^1.1.0", "symbiote/silverstripe-gridfieldextensions": "^1.1.0",
"silverstripe/taxonomy": "^1.2" "silverstripe/taxonomy": "^1.2"
}, },
"suggest": { "suggest": {

9
tests/cms/DMSUploadFieldTest.php
View File

@ -14,6 +14,15 @@ class DMSUploadFieldTest extends SapphireTest
$this->field = new DMSUploadField('StubUploadField'); $this->field = new DMSUploadField('StubUploadField');
} }
/**
* SS 3.x injector will return an overloaded parent of a child class if the child is not injected.
* This is a sanity check.
*/
public function testDmsUploadFieldIsInjectable()
{
$this->assertInstanceOf('DMSUploadField', DMSUploadField::create('Stub'));
}
/** /**
* The validator is coded to always return true. Replace this test if this behaviour changes in future. * The validator is coded to always return true. Replace this test if this behaviour changes in future.
*/ */