Merge branch '1' into 2

silverstripe · May 11, 2024 · 2488992 · 2488992
2 parents 0c5f70f + 3b2b4c6
commit 2488992
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/code/TestRegistryPage.php b/code/TestRegistryPage.php
@@ -6,7 +6,7 @@
 use SilverStripe\Security\DefaultAdminService;
 use SilverStripe\Security\Member;
 
-if (!class_exists(RegistryPage::class)) {
+if (class_exists(RegistryPage::class)) {
     class TestRegistryPage extends RegistryPage
     {
         public function requireDefaultRecords()

diff --git a/code/elemental/ElementContentExtension.php b/code/elemental/ElementContentExtension.php
@@ -2,6 +2,8 @@
 
 namespace SilverStripe\FrameworkTest\Elemental\Extension;
 
+use SilverStripe\Assets\File;
+use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Core\Extension;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\ORM\ValidationResult;
@@ -20,6 +22,11 @@ class ElementContentExtension extends Extension
         'MyInt' => 'Int',
     ];
 
+    private static $has_one = [
+        'MyPage' => SiteTree::class,
+        'MyFile' => File::class,
+    ];
+
     public function validate(ValidationResult $result)
     {
         if ($this->owner->Title == 'x') {
@@ -35,7 +42,7 @@ public function validate(ValidationResult $result)
 
     public function updateCMSCompositeValidator(CompositeValidator $compositeValidator)
     {
-        $compositeValidator->addValidator(new RequiredFields(['Title']));
+        $compositeValidator->addValidator(new RequiredFields(['Title', 'MyPageID', 'MyFile']));
     }
 
     public function updateCMSFields(FieldList $fields)