diff --git a/README.md b/README.md index 48e61d2..4b53da0 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ a simple base dataobject to use with elements ## Requirements * dnadesign/silverstripe-elemental: ^5.0 -* gorriecoe/silverstripe-linkfield: ^1.0 +* silverstripe/linkfield: ^4.0 ## Installation diff --git a/composer.json b/composer.json index c6fdf3f..cf9bba2 100644 --- a/composer.json +++ b/composer.json @@ -18,18 +18,14 @@ ], "require": { "dnadesign/silverstripe-elemental": "^5", - "gorriecoe/silverstripe-linkfield": "^1.1", "silvershop/silverstripe-hasonefield": "^4", - "silverstripe/framework": "^5", + "silverstripe/linkfield": "^4.0", "unclecheese/display-logic": "^3" }, "require-dev": { "silverstripe/recipe-testing": "^3", "silverstripe/frameworktest": "^1" }, - "suggest": { - "dynamic/silverstripe-link-migrator": "Migrate Linkable Link records to SilverStripe Link" - }, "minimum-stability": "dev", "prefer-stable": true, "autoload": { diff --git a/src/Model/BaseElementObject.php b/src/Model/BaseElementObject.php index 2108314..d16678a 100644 --- a/src/Model/BaseElementObject.php +++ b/src/Model/BaseElementObject.php @@ -2,20 +2,20 @@ namespace Dynamic\BaseObject\Model; -use DNADesign\Elemental\Forms\TextCheckboxGroupField; -use DNADesign\Elemental\Models\BaseElement; -use gorriecoe\Link\Models\Link; -use gorriecoe\LinkField\LinkField; use SilverStripe\Assets\Image; -use SilverStripe\CMS\Model\SiteTree; -use SilverStripe\Control\Director; -use SilverStripe\Forms\CheckboxField; +use SilverStripe\ORM\DataObject; use SilverStripe\Forms\FieldList; use SilverStripe\Forms\TextField; -use SilverStripe\ORM\DataObject; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Control\Director; +use SilverStripe\CMS\Model\SiteTree; +use SilverStripe\Forms\CheckboxField; use SilverStripe\Security\Permission; use SilverStripe\Versioned\Versioned; +use SilverStripe\ORM\ValidationResult; +use SilverStripe\LinkField\Models\Link; +use SilverStripe\LinkField\Form\LinkField; +use DNADesign\Elemental\Models\BaseElement; +use DNADesign\Elemental\Forms\TextCheckboxGroupField; /** * Class BaseElementObject. @@ -56,6 +56,7 @@ class BaseElementObject extends DataObject */ private static $owns = array( 'Image', + 'ElementLink', ); /**