MAGETWO-58067: [GitHub] Data Loss for Country Multiselect in Backend on Website Level

aakimov · aakimov · commit c3ed73da5179 · 2016-09-09T10:02:52.000+03:00
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/shipping/applicable_country.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/shipping/applicable_country.phtml
@@ -61,11 +61,14 @@ CountryModel.prototype = {
         if (applyCountryElement && applyCountryElement.id) {
             var specifCountryElement  = $(applyCountryElement.id.replace(/sallowspecific/, 'specificcountry'));
             var showMethodElement  = $(applyCountryElement.id.replace(/sallowspecific/, 'showmethod'));
+            // 'Use Default' checkbox of the related county list UI element
+            var useDefaultElement = document.getElementById(specifCountryElement.id + '_inherit');
+
             //var specifErrMsgElement  = $(applyCountryElement.id.replace(/sallowspecific/, 'specificerrmsg'));
             if (specifCountryElement) {
                 if (applyCountryElement.value == 1) {
-                   //if specific country element selected
-                   specifCountryElement.enable();
+                   // enable related country select only if its 'Use Default' checkbox is absent or is unchecked
+                   specifCountryElement.disabled = (useDefaultElement) ? useDefaultElement.checked : false;
                    if (showMethodElement) {
                        this.showElement(showMethodElement.up(1));
                    }
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Select/Allowspecific.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Select/Allowspecific.php
@@ -22,10 +22,32 @@ class Allowspecific extends \Magento\Framework\Data\Form\Element\Select
      */
     public function getAfterElementHtml()
     {
-        $javaScript = "\n            <script type=\"text/javascript\">require(['prototype'], function(){\n                Event.observe('{$this->getHtmlId()}', 'change', function(){\n                    specific=\$('{$this
-            ->getHtmlId()}').value;\n                    \$('{$this
-            ->_getSpecificCountryElementId()}').disabled = (!specific || specific!=1);\n                });\n            });</script>";
-        return $javaScript . parent::getAfterElementHtml();
+        $elementId = $this->getHtmlId();
+        $countryListId = $this->_getSpecificCountryElementId();
+        $useDefaultElementId = $countryListId . '_inherit';
+
+        $elementJavaScript = <<<HTML
+<script type="text/javascript">
+//<![CDATA[
+document.getElementById('{$elementId}').addEventListener('change', function(event) {
+    var isCountrySpecific = event.target.value == 1,
+        specificCountriesElement = document.getElementById('{$countryListId}'),
+        // 'Use Default' checkbox of the related county list UI element
+        useDefaultElement = document.getElementById('{$useDefaultElementId}');
+
+    if (isCountrySpecific) {
+        // enable related country select only if its 'Use Default' checkbox is absent or is unchecked
+        specificCountriesElement.disabled = (useDefaultElement) ? useDefaultElement.checked : false;
+    } else {
+        // disable related country select if all countries are used
+        specificCountriesElement.disabled = true;
+    }
+});
+//]]>
+</script>
+HTML;
+
+        return $elementJavaScript . parent::getAfterElementHtml();
     }
 
     /**
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
@@ -37,14 +37,14 @@ protected function setUp()
     public function testGetAfterElementHtml()
     {
         $this->_formMock->expects(
-            $this->exactly(2)
+            $this->once()
         )->method(
             'getHtmlIdPrefix'
         )->will(
             $this->returnValue('test_prefix_')
         );
         $this->_formMock->expects(
-            $this->exactly(2)
+            $this->once()
         )->method(
             'getHtmlIdSuffix'
         )->will(
@@ -57,7 +57,7 @@ public function testGetAfterElementHtml()
 
         $actual = $this->_object->getAfterElementHtml();
 
-        $this->assertStringEndsWith($afterHtmlCode, $actual);
+        $this->assertStringEndsWith('</script>' . $afterHtmlCode, $actual);
         $this->assertStringStartsWith('<script type="text/javascript">', trim($actual));
         $this->assertContains('test_prefix_spec_element_test_suffix', $actual);
     }
