Merge tag '2.3.16'

Bugfix release 2.3.16 Fixes more encoding and decoding problems when updating model values
contao-community-alliance · Jul 19, 2024 · 188cc5c · 188cc5c
2 parents efe5e2d + a06accd
commit 188cc5c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 7 deletions.
diff --git a/src/Contao/View/Contao2BackendView/ContaoWidgetManager.php b/src/Contao/View/Contao2BackendView/ContaoWidgetManager.php
@@ -271,7 +271,7 @@ protected function getUniqueId($propertyName)
      * Retrieve the instance of a widget for the given property.
      *
      * @param string                    $property    Name of the property for which the widget shall be retrieved.
-     * @param PropertyValueBagInterface $inputValues The input values to use (optional).
+     * @param PropertyValueBagInterface $inputValues The input values to use (optional) (RAW widget value format).
      *
      * @return Widget|null
      *
@@ -398,7 +398,7 @@ protected function generateHelpText($property, Widget $widget)
      * @param string                    $property     The name of the property for which the widget shall be rendered.
      * @param bool                      $ignoreErrors Flag if the error property of the widget shall get
      *                                                cleared prior rendering.
-     * @param PropertyValueBagInterface $inputValues  The input values to use (optional).
+     * @param PropertyValueBagInterface $inputValues  The input values to use (optional) (RAW widget value format).
      *
      * @return string
      *
@@ -468,7 +468,9 @@ public function buildHiddenFields($value, string $propertyName): array
     }
 
     /**
-     * {@inheritDoc}
+     * Process RAW input values.
+     *
+     * @param PropertyValueBag $propertyValues The RAW property values from the input provider.
      *
      * @SuppressWarnings(PHPMD.Superglobals)
      * @SuppressWarnings(PHPMD.CamelCaseVariableName)
@@ -487,6 +489,7 @@ public function processInput(PropertyValueBag $propertyValues): void
         }
 
         // Now get and validate the widgets.
+        $encodedValues = new PropertyValueBag();
         foreach (\array_keys($propertyValues->getArrayCopy()) as $property) {
             // NOTE: the passed input values are RAW DATA from the input provider - aka widget known values and not
             // native data as in the model.
@@ -502,7 +505,7 @@ public function processInput(PropertyValueBag $propertyValues): void
                 }
             } elseif ($widget->submitInput()) {
                 try {
-                    $propertyValues->setPropertyValue(
+                    $encodedValues->setPropertyValue(
                         $property,
                         $this->encodeValue($property, $widget->value, $propertyValues)
                     );
@@ -514,6 +517,9 @@ public function processInput(PropertyValueBag $propertyValues): void
                 }
             }
         }
+        foreach ($encodedValues->getArrayCopy() as $propertyName => $propertyValue) {
+            $propertyValues->setPropertyValue($propertyName, $propertyValue);
+        }
 
         $_POST = $post;
         Input::resetCache();

diff --git a/src/Contao/View/Contao2BackendView/EditMask.php b/src/Contao/View/Contao2BackendView/EditMask.php
@@ -72,6 +72,8 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveClassLength)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
  */
 class EditMask
 {
@@ -522,7 +524,7 @@ protected function getEditButtons()
      *
      * @param ContaoWidgetManager   $widgetManager  The widget manager in use.
      * @param PaletteInterface      $palette        The palette to use.
-     * @param PropertyValueBag|null $propertyValues The property values.
+     * @param PropertyValueBag|null $propertyValues The property values (model values).
      *
      * @return array
      *
@@ -547,6 +549,26 @@ protected function buildFieldSet($widgetManager, $palette, $propertyValues)
         $editInformation = System::getContainer()->get('cca.dc-general.edit-information');
         assert($editInformation instanceof EditInformationInterface);
 
+        $rawValues = new PropertyValueBag();
+        if (null !== $propertyValues) {
+            foreach ($palette->getLegends() as $legend) {
+                $properties = $legend->getProperties($this->model, $propertyValues);
+                if (!$properties) {
+                    continue;
+                }
+                foreach ($properties as $property) {
+                    $propName = $property->getName();
+                    $this->ensurePropertyExists($propName, $propertyDefinitions);
+                    if ($propertyValues->hasPropertyValue($propName)) {
+                        $rawValues->setPropertyValue(
+                            $propName,
+                            $widgetManager->decodeValue($propName, $propertyValues->getPropertyValue($propName))
+                        );
+                    }
+                }
+            }
+        }
+
         $fieldSets = [];
         $first     = true;
         foreach ($palette->getLegends() as $legend) {
@@ -593,7 +615,7 @@ protected function buildFieldSet($widgetManager, $palette, $propertyValues)
                     );
                 }
 
-                $fields[] = $widgetManager->renderWidget($property->getName(), $isAutoSubmit, $propertyValues);
+                $fields[] = $widgetManager->renderWidget($property->getName(), $isAutoSubmit, $rawValues);
             }
 
             $fieldSet['label']   = $legendName;

diff --git a/src/Controller/ControllerInterface.php b/src/Controller/ControllerInterface.php
@@ -110,7 +110,7 @@ public function assembleAllChildrenFrom($model, $providerName = '');
      * Update the current model from a post request. Additionally, trigger meta palettes, if installed.
      *
      * @param ModelInterface            $model          The model to update.
-     * @param PropertyValueBagInterface $propertyValues The value bag to retrieve the values from.
+     * @param PropertyValueBagInterface $propertyValues The value bag to retrieve the values from (model values).
      *
      * @return ControllerInterface
      */