Merge remote-tracking branch 'origin/MC-30140' into 2.4-develop-pr6

Author: serhii-balko

app/code/Magento/Config/Block/System/Config/Form/Field.php

@@ -43,6 +43,10 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
             $element->setDisabled(true);
         }
 
+        if ($element->getIsDisableInheritance()) {
+            $element->setReadonly(true);
+        }
+
         $html = '<td class="label"><label for="' .
             $element->getHtmlId() . '"><span' .
             $this->_renderScopeLabel($element) . '>' .
@@ -94,7 +98,7 @@ protected function _renderInheritCheckbox(\Magento\Framework\Data\Form\Element\A
         $htmlId = $element->getHtmlId();
         $namePrefix = preg_replace('#\[value\](\[\])?$#', '', $element->getName());
         $checkedHtml = $element->getInherit() == 1 ? 'checked="checked"' : '';
-        $disabled = $element->getIsDisableInheritance() == true ? ' disabled="disabled"' : '';
+        $disabled = $element->getIsDisableInheritance() == true ? ' disabled="disabled" readonly="1"' : '';
 
         $html = '<td class="use-default">';
         $html .= '<input id="' .

app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php

@@ -7,8 +7,6 @@
 
 /**
  * Test how class render field html element in Stores Configuration
- *
- * @package Magento\Config\Test\Unit\Block\System\Config\Form
  */
 class FieldTest extends \PHPUnit\Framework\TestCase
 {
@@ -72,6 +70,7 @@ protected function setUp()
                 'getCanUseDefaultValue',
                 'setDisabled',
                 'getTooltip',
+                'setReadonly'
             ]
         );
 
@@ -179,15 +178,16 @@ public function testRenderInheritCheckbox()
         $this->_elementMock->expects($this->any())->method('getCanUseWebsiteValue')->will($this->returnValue(true));
         $this->_elementMock->expects($this->any())->method('getCanUseDefaultValue')->will($this->returnValue(true));
         $this->_elementMock->expects($this->once())->method('setDisabled')->with(true);
-        $this->_elementMock->expects($this->once())->method('getIsDisableInheritance')->willReturn(true);
+        $this->_elementMock->method('getIsDisableInheritance')->willReturn(true);
+        $this->_elementMock->method('setReadonly')->with(true);
 
         $expected = '<td class="use-default">';
         $expected .= '<input id="' .
             $this->_testData['htmlId'] .
             '_inherit" name="' .
             $this->_testData['name'] .
             '[inherit]" type="checkbox" value="1"' .
-            ' class="checkbox config-inherit" checked="checked"' . ' disabled="disabled"' .
+            ' class="checkbox config-inherit" checked="checked"' . ' disabled="disabled"' . ' readonly="1"' .
             ' onclick="toggleValueElements(this, Element.previous(this.parentNode))" /> ';
 
         $expected .= '<label for="' . $this->_testData['htmlId'] . '_inherit" class="inherit">Use Website</label>';

lib/web/mage/adminhtml/form.js

@@ -494,7 +494,8 @@ define([
                     inputs.each(function (item) {
                         // don't touch hidden inputs (and Use Default inputs too), bc they may have custom logic
                         if ((!item.type || item.type != 'hidden') && !($(item.id + '_inherit') && $(item.id + '_inherit').checked) && //eslint-disable-line
-                            !(currentConfig['can_edit_price'] != undefined && !currentConfig['can_edit_price']) //eslint-disable-line
+                            !(currentConfig['can_edit_price'] != undefined && !currentConfig['can_edit_price']) && //eslint-disable-line
+                            !item.getAttribute('readonly') //eslint-disable-line
                         ) {
                             item.disabled = false;
                             jQuery(item).removeClass('ignore-validate');