MAGETWO-52042: Saving swatch option cause errors

Yurii Hryhoriev · Yurii Hryhoriev · commit 922570c3c8ca · 2016-04-29T16:07:01.000+03:00
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php
@@ -34,12 +34,10 @@ public function __construct(
      */
     public function execute()
     {
-        $this->_view->loadLayout('popup');
         $this->productBuilder->build($this->getRequest());
         $attributeBlock = $this->_view->getLayout()->createBlock(
             'Magento\ConfigurableProduct\Block\Adminhtml\Product\Attribute\NewAttribute\Product\Created'
         );
-        $this->_addContent($attributeBlock);
-        $this->_view->renderLayout();
+        $this->getResponse()->setBody($attributeBlock->toHtml());
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
@@ -18,7 +18,4 @@
     $('#create_new_attribute').modal('closeModal');
 
 })(window.parent.jQuery);
-</script>
-<div class="a-center">
-    <?php echo $block->getCloseButtonHtml() ?>
-</div>
+</script>

Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,10 @@ public function __construct(`
`34`	`34`	`*/`
`35`	`35`	`public function execute()`
`36`	`36`	`{`
`37`		`- $this->_view->loadLayout('popup');`
`38`	`37`	`$this->productBuilder->build($this->getRequest());`
`39`	`38`	`$attributeBlock = $this->_view->getLayout()->createBlock(`
`40`	`39`	`'Magento\ConfigurableProduct\Block\Adminhtml\Product\Attribute\NewAttribute\Product\Created'`
`41`	`40`	`);`
`42`		`- $this->_addContent($attributeBlock);`
`43`		`- $this->_view->renderLayout();`
	`41`	`+ $this->getResponse()->setBody($attributeBlock->toHtml());`
`44`	`42`	`}`
`45`	`43`	`}`