Merge remote-tracking branch 'origin/MC-39096' into 2.4-develop-pr111

Author: zakdma

lib/web/mage/adminhtml/form.js

@@ -465,7 +465,7 @@ define([
             // define whether the target should show up
             var shouldShowUp = true,
                 idFrom, from, values, isInArray, isNegative, headElement, isInheritCheckboxChecked, target, inputs,
-                isAnInputOrSelect, currentConfig, rowElement, fromId, radioFrom;
+                isAnInputOrSelect, currentConfig, rowElement, fromId, radioFrom, targetArray, isChooser;
 
             for (idFrom in valuesFrom) { //eslint-disable-line guard-for-in
                 from = $(idFrom);
@@ -502,6 +502,12 @@ define([
 
             // Account for the chooser style parameters.
             if (target === null && headElement.length === 0 && idTo.substring(0, 16) === 'options_fieldset') {
+                targetArray = $$('input[id*="' + idTo + '"]');
+                isChooser = true;
+
+                if (targetArray !== null && targetArray.length > 0) {
+                    target = targetArray[0];
+                }
                 headElement = jQuery('.field-' + idTo).add('.field-chooser' + idTo);
             }
 
@@ -526,7 +532,7 @@ define([
                         // 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
-                            !item.getAttribute('readonly') //eslint-disable-line
+                            !item.getAttribute('readonly') || isChooser //eslint-disable-line
                         ) {
                             item.disabled = false;
                             jQuery(item).removeClass('ignore-validate');