diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
index d8ac9fdf9131d8dbab66cde7181dfa23b28ec63c..0ec9ddf3298f9daec7ab9dfec22765ad95521919 100644
--- a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
+++ b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
@@ -458,7 +458,8 @@ class BundlePanel extends AbstractModifier
'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,
diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-input-type.js b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-input-type.js
index e52856e53891c64981c9e617afb01c77b453363a..14dd426ed02aa7f144c109a0ac17016be2d56329 100644
--- a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-input-type.js
+++ b/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);
},
diff --git a/app/code/Magento/Catalog/Setup/UpgradeData.php b/app/code/Magento/Catalog/Setup/UpgradeData.php
index 2e05d5b0ac770bdeaacd056a52819a0c582ca1e5..542fea6770fab226e2bb7d22643d0dc74f66218e 100644
--- a/app/code/Magento/Catalog/Setup/UpgradeData.php
+++ b/app/code/Magento/Catalog/Setup/UpgradeData.php
@@ -257,6 +257,12 @@ class UpgradeData implements UpgradeDataInterface
'frontend_label',
'Small'
);
+ $categorySetup->updateAttribute(
+ ProductAttributeInterface::ENTITY_TYPE_CODE,
+ 'image',
+ 'frontend_input_renderer',
+ null
+ );
//Design tab
$categorySetup->updateAttribute(
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
index 473d1d423067478ea94d0c8b5afcc88c68de40c2..61141072f7725e165cb29938e7878b6b240ef6a6 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
@@ -319,8 +319,7 @@ class CustomOptions extends AbstractModifier
'sortOrder' => 20,
'actions' => [
[
- 'targetName' => static::FORM_NAME . '.' . static::FORM_NAME . '.'
- . static::GROUP_CUSTOM_OPTIONS_NAME . '.' . static::GRID_OPTIONS_NAME,
+ 'targetName' => 'ns = ${ $.ns }, index = ' . static::GRID_OPTIONS_NAME,
'actionName' => 'addChild',
]
]
diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_edit.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_edit.xml
index dbc98c4b59d52a82d3af8c01851f7ac9625e6f22..2b57747de4fcaee6268c3e77d800f45df7a95549 100644
--- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_edit.xml
+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_edit.xml
@@ -6,7 +6,6 @@
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
- <update handle="styles"/>
<body>
<referenceContainer name="content">
<uiComponent name="cms_page_form"/>
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 2fc849be10f10988356b977298168173a18a4f7b..fc496b83febb52d1ce0eaaa400e0d1faf65c8d8a 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -509,8 +509,8 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
->addAttributeToSelect('name')
->addAttributeToSelect('price')
->addAttributeToSelect('weight')
-// ->addAttributeToSelect('msrp')
-// ->addAttributeToSelect('media_gallery')
+ ->addAttributeToSelect('image')
+ ->addAttributeToSelect('status')
->addFilterByRequiredOptions()
->setStoreId($product->getStoreId());
diff --git a/app/code/Magento/Downloadable/view/adminhtml/web/js/components/is-downloadable-handler.js b/app/code/Magento/Downloadable/view/adminhtml/web/js/components/is-downloadable-handler.js
index 5e619b76c7ecd8ba22fd1e8ff3f25786ac93d33e..8fc6508cd877d752eb94640abeebbc895ec1a716 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/web/js/components/is-downloadable-handler.js
+++ b/app/code/Magento/Downloadable/view/adminhtml/web/js/components/is-downloadable-handler.js
@@ -22,7 +22,7 @@ define([
* Change visibility for samplesFieldset & linksFieldset based on current statuses of checkbox.
*/
changeVisibility: function () {
- if (this.samplesFieldset && this.linksFieldset) {
+ if (this.samplesFieldset() && this.linksFieldset()) {
if (this.checked() && !this.disabled()) {
this.samplesFieldset().visible(true);
this.linksFieldset().visible(true);
diff --git a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
index b6f74dda267eb9dcbf30932a6659989a934b8046..82cc34b42b12088f781629fac0a8a53948437d0e 100644
--- a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
+++ b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
@@ -64,7 +64,7 @@
"component": "Magento_Ui/js/lib/step-wizard",
"initData": <?= /* @escapeNotVerified */ $this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getInitData()) ?>,
"stepsNames": <?= /* @escapeNotVerified */ $this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getStepComponents()) ?>,
- "modalClass": "<?= /* @noEscape */ $block->getData('config/modal')?>"
+ "modalClass": "<?= /* @noEscape */ $block->getData('config/dataScope')?>"
}
}
}
diff --git a/app/code/Magento/Widget/Model/Widget.php b/app/code/Magento/Widget/Model/Widget.php
index fbf2485d37542a489d3a8e6b8bf447a6d94e81c5..2235df9aff0772f05eb7ea71d0ebf60010893570 100644
--- a/app/code/Magento/Widget/Model/Widget.php
+++ b/app/code/Magento/Widget/Model/Widget.php
@@ -309,7 +309,7 @@ class Widget
} elseif (trim($value) == '') {
$widget = $this->getConfigAsObject($type);
$parameters = $widget->getParameters();
- if (is_object($parameters[$name])) {
+ if (isset($parameters[$name]) && is_object($parameters[$name])) {
$value = $parameters[$name]->getValue();
}
}