add support for formwidgets as fieldset internal fields

Author: mjauvin

modules/backend/formwidgets/FieldSet.php

@@ -3,6 +3,7 @@
 namespace Backend\FormWidgets;
 
 use ApplicationException;
+use Backend\Classes\FormField;
 use Backend\Classes\FormWidgetBase;
 use Backend\Widgets\Form;
 
@@ -71,14 +72,15 @@ protected function loadAssets()
      */
     public function getFormFields(): array
     {
-        $fields = $this->formWidget->getFields();
+        return $this->formWidget->getFields();
+    }
 
-        foreach ($fields as $field) {
-            if ($this->model->hasRelation($field->fieldName)) {
-                throw new ApplicationException(trans('backend::lang.fieldset.relation-not-supported', ['field' => $field->fieldName]));
-            }
-        }
-        return $fields;
+    /**
+     * return an internal formwidget's formWidget
+     */
+    public function getFormWidget($field): FormWidgetBase
+    {
+        return $this->formWidget->getFormWidget($field);
     }
 
     /**
@@ -94,4 +96,12 @@ public function prepareVars()
     {
         $this->formWidget->previewMode = $this->previewMode;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSaveValue($value)
+    {
+        return $this->formWidget->getSaveValue($value);
+    }
 }

modules/backend/lang/en/lang.php

@@ -244,9 +244,6 @@
         'column_switch_true' => 'Yes',
         'column_switch_false' => 'No',
     ],
-    'fieldset' => [
-        'relation-not-supported' => ':field: model relation fields are not supported by the fieldset formwidget',
-    ],
     'fileupload' => [
         'attachment' => 'Attachment',
         'help' => 'Add a title and description for this attachment.',

modules/backend/widgets/Form.php

@@ -6,6 +6,7 @@
 use Backend\Classes\FormWidgetBase;
 use Backend\Classes\WidgetBase;
 use Backend\Classes\WidgetManager;
+use Backend\FormWidgets\FieldSet;
 use BackendAuth;
 use Exception;
 use Form as FormHelper;
@@ -1222,20 +1223,21 @@ public function getSaveData(): array
             }
 
             // get nested widget fields that should be saved to the model
-            if (method_exists($widget, 'getFormFields')) {
+            if ($widget instanceof FieldSet) {
                 foreach ($widget->getFormFields() as $field) {
                     $parts = HtmlHelper::nameToArray($field->fieldName);
                     if (($value = $this->dataArrayGet($data, $parts)) !== null) {
-                        /*
-                         * Number fields should be converted to integers
-                         */
                         if ($field->type === 'number') {
                             $value = !strlen(trim($value)) ? null : (float) $value;
                         }
+                        if ($field->type === 'widget') {
+                            $value = $widget->getFormWidget($field->fieldName)->getSaveValue($value);
+                        }
 
                         $this->dataArraySet($result, $parts, $value);
                     }
                 }
+                continue;
             }
 
             // Exclude fields that didn't provide any value