diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml index 230e0fd14ccb6..72a665745cfec 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml @@ -256,7 +256,8 @@ $currencySymbol = $block->getCurrencySymbol(); "productAttributes": helper('Magento\Framework\Json\Helper\Data')->jsonEncode($attributes) ?>, "productUrl": "getUrl('catalog/product/edit', ['id' => '%id%']) ?>", "currencySymbol": "", - "configurableProductGrid": "configurableProductGrid" + "configurableProductGrid": "configurableProductGrid", + "errorSelector":".admin__field-error" } } } diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js index e2e0faec3b805..188978cb5c135 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js @@ -410,13 +410,17 @@ define([ if (this.source.data['configurable-matrix']) { this.source.data['configurable-matrix-serialized'] = JSON.stringify(this.source.data['configurable-matrix']); - delete this.source.data['configurable-matrix']; + if ($(this.errorSelector).length===0) { + delete this.source.data['configurable-matrix']; + } } if (this.source.data['associated_product_ids']) { this.source.data['associated_product_ids_serialized'] = JSON.stringify(this.source.data['associated_product_ids']); - delete this.source.data['associated_product_ids']; + if ($(this.errorSelector).length===0) { + delete this.source.data['associated_product_ids']; + } } },