last attempt at fixing this

wintercms · Aug 11, 2024 · 58eb6ab · 58eb6ab
1 parent 45abd1a
commit 58eb6ab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
@@ -246,9 +246,11 @@ public function create_onSave($context = null)
         $this->controller->formBeforeSave($model);
         $this->controller->formBeforeCreate($model);
 
-        $this->formWidget->setFormValues();
-        $modelsToSave = $this->prepareModelsToSave($model, $this->formWidget->getSaveData());
+        $saveData = $this->formWidget->getSaveData(true);
+        $this->formWidget->setFormValues($saveData);
+        $this->formWidget->applyFiltersFromModel();
 
+        $modelsToSave = $this->prepareModelsToSave($model, $this->formWidget->getSaveData());
         Db::transaction(function () use ($modelsToSave) {
             foreach ($modelsToSave as $modelToSave) {
                 $modelToSave->save(null, $this->formWidget->getSessionKey());
@@ -316,9 +318,11 @@ public function update_onSave($recordId = null, $context = null)
         $this->controller->formBeforeSave($model);
         $this->controller->formBeforeUpdate($model);
 
-        $this->formWidget->setFormValues();
-        $modelsToSave = $this->prepareModelsToSave($model, $this->formWidget->getSaveData());
+        $saveData = $this->formWidget->getSaveData(true);
+        $this->formWidget->setFormValues($saveData);
+        $this->formWidget->applyFiltersFromModel();
 
+        $modelsToSave = $this->prepareModelsToSave($model, $this->formWidget->getSaveData());
         Db::transaction(function () use ($modelsToSave) {
             foreach ($modelsToSave as $modelToSave) {
                 $modelToSave->save(null, $this->formWidget->getSessionKey());

diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
@@ -1175,7 +1175,6 @@ protected function showFieldLabels($field)
     public function getSaveData(bool $includeAllFields = false): array
     {
         $this->defineFormFields();
-        $this->applyFiltersFromModel();
 
         $result = [];