Merge branch 'MAGETWO-50460' of https://github.corp.magento.com/magento-tango/magento2ce into MAGETWO-51470

Author: shiftedreality

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php

@@ -458,7 +458,8 @@ protected function getOptionInfo()
                                 'component' => 'Magento_Bundle/js/components/bundle-input-type',
                                 'parentContainer' => 'product_bundle_container',
                                 'selections' => 'bundle_selections',
-                                'targetIndex' => 'is_default',
+                                'isDefaultIndex' => 'is_default',
+                                'userDefinedIndex' => 'selection_can_change_qty',
                                 'dataScope' => 'type',
                                 'label' => __('Input Type'),
                                 'sortOrder' => 20,

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-input-type.js

@@ -26,36 +26,42 @@ define([
 
             if (type !== this.previousType) {
                 this.previousType = type;
-
-                if (type === 'radio') {
-                    this.clearValues();
-                }
+                this.processSelections(type === 'radio');
             }
 
             this._super();
         },
 
         /**
-         * Clears values in components like this.
+         * Toggle 'User Defined' column and clears values
+         * @param {Boolean} isRadio
          */
-        clearValues: function () {
+        processSelections: function (isRadio) {
             var records = registry.get(this.retrieveParentName(this.parentContainer) + '.' + this.selections),
                 checkedFound = false;
 
             records.elems.each(function (record) {
                 record.elems.filter(function (comp) {
-                    return comp.index === this.targetIndex;
+                    return comp.index === this.userDefinedIndex;
                 }, this).each(function (comp) {
-                    if (comp.checked()) {
-                        if (checkedFound) {
-                            comp.clearing = true;
-                            comp.clear();
-                            comp.clearing = false;
-                        }
-
-                        checkedFound = true;
-                    }
+                    comp.visible(isRadio);
                 });
+
+                if (isRadio) {
+                    record.elems.filter(function (comp) {
+                        return comp.index === this.isDefaultIndex;
+                    }, this).each(function (comp) {
+                        if (comp.checked()) {
+                            if (checkedFound) {
+                                comp.clearing = true;
+                                comp.clear();
+                                comp.clearing = false;
+                            }
+
+                            checkedFound = true;
+                        }
+                    });
+                }
             }, this);
         },