Merge pull request #1286 from creative-commoners/pulls/7/fieldlist-ty…

…ping FIX Pass arrays to addFieldsToTab
silverstripe · May 13, 2024 · fcd4ddc · fcd4ddc
2 parents 179d145 + 796fffe
commit fcd4ddc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/code/Model/EditableFormField.php b/code/Model/EditableFormField.php
@@ -318,14 +318,14 @@ public function getCMSFields()
         // Validation
         $validationFields = $this->getFieldValidationOptions();
         if ($validationFields && $validationFields->count()) {
-            $fields->addFieldsToTab('Root.Validation', $validationFields);
+            $fields->addFieldsToTab('Root.Validation', $validationFields->toArray());
             $fields->fieldByName('Root.Validation')->setTitle(_t(__CLASS__.'.VALIDATION', 'Validation'));
         }
 
         // Add display rule fields
         $displayFields = $this->getDisplayRuleFields();
         if ($displayFields && $displayFields->count()) {
-            $fields->addFieldsToTab('Root.DisplayRules', $displayFields);
+            $fields->addFieldsToTab('Root.DisplayRules', $displayFields->toArray());
         }
 
         // Placeholder

diff --git a/code/UserForm.php b/code/UserForm.php
@@ -234,9 +234,9 @@ public function getCMSFields()
                 ->getComponentByType(GridFieldDetailForm::class)
                 ->setItemRequestClass(UserFormRecipientItemRequest::class);
 
-            $fields->addFieldsToTab('Root.FormOptions', $onCompleteFieldSet);
+            $fields->addFieldToTab('Root.FormOptions', $onCompleteFieldSet);
             $fields->addFieldToTab('Root.Recipients', $emailRecipients);
-            $fields->addFieldsToTab('Root.FormOptions', $this->getFormOptions());
+            $fields->addFieldsToTab('Root.FormOptions', $this->getFormOptions()->toArray());
 
             $submissions = $this->getSubmissionsGridField();
             $fields->findOrMakeTab('Root.Submissions')->setTitle(_t('SilverStripe\\UserForms\\Model\\UserDefinedForm.SUBMISSIONS', 'Submissions'));