MAGETWO-82469: Can't save "Minimum Qty Allowed" configuration option …

…in Catalog->Inventory->Product Stock Options
magento · Oct 24, 2017 · 6c9a8b2 · 6c9a8b2
1 parent a08cf22
commit 6c9a8b2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -8,6 +8,7 @@
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
 use Magento\Config\Model\Config\Structure\ElementVisibilityInterface;
+use Magento\Framework\App\Config\Data\ProcessorInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
@@ -429,6 +430,18 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
         if ($data === null) {
             $path = $field->getConfigPath() !== null ? $field->getConfigPath() : $path;
             $data = $this->getConfigValue($path);
+            if ($field->hasBackendModel()) {
+                $backendModel = $field->getBackendModel();
+                // Backend models which implement ProcessorInterface are processed by ScopeConfigInterface
+                if (!$backendModel instanceof ProcessorInterface) {
+                    $backendModel->setPath($path)
+                        ->setValue($data)
+                        ->setWebsite($this->getWebsiteCode())
+                        ->setStore($this->getStoreCode())
+                        ->afterLoad();
+                    $data = $backendModel->getValue();
+                }
+            }
         }
 
         return $data;

diff --git a/app/code/Magento/Config/Model/Config/Backend/Serialized.php b/app/code/Magento/Config/Model/Config/Backend/Serialized.php
@@ -5,15 +5,14 @@
  */
 namespace Magento\Config\Model\Config\Backend;
 
-use Magento\Framework\App\Config\Data\ProcessorInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * @api
  * @since 100.0.2
  */
-class Serialized extends \Magento\Framework\App\Config\Value implements ProcessorInterface
+class Serialized extends \Magento\Framework\App\Config\Value
 {
     /**
      * @var Json
@@ -68,12 +67,4 @@ public function beforeSave()
         parent::beforeSave();
         return $this;
     }
-
-    /**
-     * @inheritdoc
-     */
-    public function processValue($value)
-    {
-        return empty($value) ? '' : $this->serializer->unserialize($value);
-    }
 }
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
@@ -548,7 +548,7 @@ public function initFieldsDataProvider()
                 false,
                 'some_value',
                 null,
-                0,
+                1,
                 false,
                 false,
                 false
@@ -560,7 +560,7 @@ public function initFieldsDataProvider()
                 true,
                 'Config Value',
                 null,
-                0,
+                1,
                 true,
                 false,
                 true

diff --git a/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/_files/test_config.xml b/dev/tests/integration/testsuite/Magento/Config/Block/System/Config/_files/test_config.xml
@@ -10,7 +10,7 @@
         <test_section>
             <test_group>
                  <test_field_encrypted backend_model="Magento\Config\Model\Config\Backend\Encrypted">{ENCRYPTED_VALUE}</test_field_encrypted>
-                 <test_field_serialized backend_model="Magento\Config\Model\Config\Backend\Serialized">["value1","value2"]</test_field_serialized>
+                 <test_field_serialized>["value1","value2"]</test_field_serialized>
                  <test_field>test config value</test_field>
             </test_group>
         </test_section>