Merge remote-tracking branch 'mainline/develop' into NORD-PR-INTERNAL

le0n4eg · le0n4eg · commit 6d8074fa1ad2 · 2017-04-27T11:01:51.000+03:00
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
@@ -720,7 +720,7 @@ protected function _collectSuperDataLabels($data, $productSuperAttrId, $productI
         $label = isset($variationLabels[$data['_super_attribute_code']])
                 ? $variationLabels[$data['_super_attribute_code']]
                 : $attrParams['frontend_label'];
-        $this->_superAttributesData['labels'][] = [
+        $this->_superAttributesData['labels'][$productSuperAttrId] = [
             'product_super_attribute_id' => $productSuperAttrId,
             'store_id' => 0,
             'use_default' => $label ? 0 : 1,
diff --git a/app/code/Magento/ConfigurableProduct/Model/AttributeOptionProvider.php b/app/code/Magento/ConfigurableProduct/Model/AttributeOptionProvider.php
@@ -77,6 +77,7 @@ private function getAttributeOptionsSelect(AbstractAttribute $superAttribute, $p
                     'default_option_value.value'
                 ),
                 'default_title' => 'default_option_value.value',
+                'super_attribute_label' => 'attribute_label.value',
             ]
         )->joinInner(
             ['product_entity' => $this->attributeResource->getTable('catalog_product_entity')],
@@ -126,6 +127,16 @@ private function getAttributeOptionsSelect(AbstractAttribute $superAttribute, $p
                 ]
             ),
             []
+        )->joinLeft(
+            ['attribute_label' => $this->attributeResource->getTable('catalog_product_super_attribute_label')],
+            implode(
+                ' AND ',
+                [
+                    'super_attribute.product_super_attribute_id = attribute_label.product_super_attribute_id',
+                    'attribute_label.store_id = ' . \Magento\Store\Model\Store::DEFAULT_STORE_ID
+                ]
+            ),
+            []
         )->where(
             'super_attribute.product_id = ?',
             $productId
diff --git a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatch.php b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatch.php
@@ -78,7 +78,9 @@ public function __construct(
     /**
      * Create store values
      *
-     * @codeCoverageIgnore
+     * Method not intended to escape HTML entities
+     * Escaping will be applied in template files
+     *
      * @param integer $storeId
      * @param integer $optionId
      * @return array
@@ -88,10 +90,8 @@ protected function createStoreValues($storeId, $optionId)
         $value = [];
         $storeValues = $this->getStoreOptionValues($storeId);
         $swatchStoreValue = isset($storeValues['swatch']) ? $storeValues['swatch'] : null;
-        $value['store' . $storeId] = isset($storeValues[$optionId]) ?
-            $this->escapeHtml($storeValues[$optionId]) : '';
-        $value['swatch' . $storeId] = isset($swatchStoreValue[$optionId]) ?
-            $this->escapeHtml($swatchStoreValue[$optionId]) : '';
+        $value['store' . $storeId] = isset($storeValues[$optionId]) ? $storeValues[$optionId] : '';
+        $value['swatch' . $storeId] = isset($swatchStoreValue[$optionId]) ? $swatchStoreValue[$optionId] : '';
 
         return $value;
     }
diff --git a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php
@@ -19,7 +19,9 @@ class Visual extends AbstractSwatch
     /**
      * Create store values
      *
-     * @codeCoverageIgnore
+     * Method not intended to escape HTML entities
+     * Escaping will be applied in template files
+     *
      * @param integer $storeId
      * @param integer $optionId
      * @return array
@@ -38,16 +40,16 @@ protected function createStoreValues($storeId, $optionId)
         }
 
         if (isset($storeValues[$optionId])) {
-            $value['store' . $storeId] = $this->escapeHtml($storeValues[$optionId]);
+            $value['store' . $storeId] = $storeValues[$optionId];
         }
 
         if (isset($swatchStoreValue[$optionId])) {
-            $value['defaultswatch' . $storeId] = $this->escapeHtml($swatchStoreValue[$optionId]);
+            $value['defaultswatch' . $storeId] = $swatchStoreValue[$optionId];
         }
 
         $swatchStoreValue = $this->reformatSwatchLabels($swatchStoreValue);
         if (isset($swatchStoreValue[$optionId])) {
-            $value['swatch' . $storeId] = $this->escapeHtml($swatchStoreValue[$optionId]);
+            $value['swatch' . $storeId] = $swatchStoreValue[$optionId];
         }
 
         return $value;
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Export/RowCustomizerTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Export/RowCustomizerTest.php
@@ -44,5 +44,9 @@ public function testPrepareData()
             'sku=simple_10,test_configurable=Option 1|sku=simple_20,test_configurable=Option 2',
             $result['configurable_variations']
         );
+        $this->assertEquals(
+            'test_configurable=Test Configurable',
+            $result['configurable_variation_labels']
+        );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/Product/Type/ConfigurableTest.php
@@ -134,7 +134,7 @@ public function testConfigurableImport($pathToFile, $productName, $optionSkuList
             $this->assertArrayHasKey('frontend_label', $productAttributeData);
             $this->assertEquals('Test Configurable', $productAttributeData['frontend_label']);
             $this->assertArrayHasKey('label', $optionData);
-            $this->assertEquals('test_configurable', $optionData['label']);
+            $this->assertEquals('test_configurable_custom_label', $optionData['label']);
             $this->assertArrayHasKey('use_default', $optionData);
             $this->assertArrayHasKey('options', $optionData);
             $this->assertEquals('Option 1', $optionData['options'][0]['label']);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/_files/import_configurable.csv b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/_files/import_configurable.csv
@@ -1,4 +1,4 @@
 sku,store_view_code,attribute_set_code,product_type,name,description,short_description,weight,product_online,tax_class_name,visibility,price,url_key,display_product_options_in,map_price,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,configurable_variations,configurable_variation_labels,associated_skus
 Configurable 1-Option 1,,Default,simple,Configurable 1-Option 1,,,,1,Taxable Goods,Not Visible Individually,10,configurable-1-option-1,Block after Info Column,,"attribute_with_option=Option Label,has_options=0,quantity_and_stock_status=In Stock,required_options=0,test_configurable=Option 1",99999,0,0,0,0,1,1,0,0,0,1,,1,1,0,0,1,0,0,0,1,,,
 Configurable 1-Option 2,,Default,simple,Configurable 1-Option 2,,,,1,Taxable Goods,Not Visible Individually,10,configurable-1-option-2,Block after Info Column,,"has_options=0,quantity_and_stock_status=In Stock,required_options=0,test_configurable=Option 2",99999,0,0,0,0,1,1,0,0,0,1,,1,1,0,0,1,0,0,0,1,,,
-Configurable 1,,Default,configurable,Configurable 1,,,,1,Taxable Goods,"Catalog, Search",10,configurable-1,Block after Info Column,,"has_options=1,quantity_and_stock_status=In Stock,required_options=0",0,0,0,0,0,1,1,0,0,0,1,,1,0,0,0,1,0,0,0,1,"sku=Configurable 1-Option 1,test_configurable=Option 1|sku=Configurable 1-Option 2,test_configurable=Option 2",test_configurable=test_configurable,
+Configurable 1,,Default,configurable,Configurable 1,,,,1,Taxable Goods,"Catalog, Search",10,configurable-1,Block after Info Column,,"has_options=1,quantity_and_stock_status=In Stock,required_options=0",0,0,0,0,0,1,1,0,0,0,1,,1,0,0,0,1,0,0,0,1,"sku=Configurable 1-Option 1,test_configurable=Option 1|sku=Configurable 1-Option 2,test_configurable=Option 2",test_configurable=test_configurable_custom_label,
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/_files/import_configurable_12345.csv b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/Import/_files/import_configurable_12345.csv
@@ -1,4 +1,4 @@
 sku,store_view_code,attribute_set_code,product_type,name,description,short_description,weight,product_online,tax_class_name,visibility,price,url_key,display_product_options_in,map_price,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,configurable_variations,configurable_variation_labels,associated_skus
 Configurable 1-Option 1,,Default,simple,Configurable 1-Option 1,,,,1,Taxable Goods,Not Visible Individually,10,configurable-1-option-1,Block after Info Column,,"attribute_with_option=Option Label,has_options=0,quantity_and_stock_status=In Stock,required_options=0,test_configurable=Option 1",99999,0,0,0,0,1,1,0,0,0,1,,1,1,0,0,1,0,0,0,1,,,
 Configurable 1-Option 2,,Default,simple,Configurable 1-Option 2,,,,1,Taxable Goods,Not Visible Individually,10,configurable-1-option-2,Block after Info Column,,"has_options=0,quantity_and_stock_status=In Stock,required_options=0,test_configurable=Option 2",99999,0,0,0,0,1,1,0,0,0,1,,1,1,0,0,1,0,0,0,1,,,
-12345,,Default,configurable,12345,,,,1,Taxable Goods,"Catalog, Search",10,12345,Block after Info Column,,"has_options=1,quantity_and_stock_status=In Stock,required_options=0",0,0,0,0,0,1,1,0,0,0,1,,1,0,0,0,1,0,0,0,1,"sku=Configurable 1-Option 1,test_configurable=Option 1|sku=Configurable 1-Option 2,test_configurable=Option 2",test_configurable=test_configurable,
+12345,,Default,configurable,12345,,,,1,Taxable Goods,"Catalog, Search",10,12345,Block after Info Column,,"has_options=1,quantity_and_stock_status=In Stock,required_options=0",0,0,0,0,0,1,1,0,0,0,1,,1,0,0,0,1,0,0,0,1,"sku=Configurable 1-Option 1,test_configurable=Option 1|sku=Configurable 1-Option 2,test_configurable=Option 2",test_configurable=test_configurable_custom_label,

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@ class Visual extends AbstractSwatch`
`19`	`19`	`/**`
`20`	`20`	`* Create store values`
`21`	`21`	`*`
`22`		`- * @codeCoverageIgnore`
	`22`	`+ * Method not intended to escape HTML entities`
	`23`	`+ * Escaping will be applied in template files`
	`24`	`+ *`
`23`	`25`	`* @param integer $storeId`
`24`	`26`	`* @param integer $optionId`
`25`	`27`	`* @return array`
`@@ -38,16 +40,16 @@ protected function createStoreValues($storeId, $optionId)`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`if (isset($storeValues[$optionId])) {`
`41`		`- $value['store' . $storeId] = $this->escapeHtml($storeValues[$optionId]);`
	`43`	`+ $value['store' . $storeId] = $storeValues[$optionId];`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`if (isset($swatchStoreValue[$optionId])) {`
`45`		`- $value['defaultswatch' . $storeId] = $this->escapeHtml($swatchStoreValue[$optionId]);`
	`47`	`+ $value['defaultswatch' . $storeId] = $swatchStoreValue[$optionId];`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`$swatchStoreValue = $this->reformatSwatchLabels($swatchStoreValue);`
`49`	`51`	`if (isset($swatchStoreValue[$optionId])) {`
`50`		`- $value['swatch' . $storeId] = $this->escapeHtml($swatchStoreValue[$optionId]);`
	`52`	`+ $value['swatch' . $storeId] = $swatchStoreValue[$optionId];`
`51`	`53`	`}`
`52`	`54`
`53`	`55`	`return $value;`
Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,9 @@ public function testPrepareData()`
`44`	`44`	`'sku=simple_10,test_configurable=Option 1\|sku=simple_20,test_configurable=Option 2',`
`45`	`45`	`$result['configurable_variations']`
`46`	`46`	`);`
	`47`	`+ $this->assertEquals(`
	`48`	`+ 'test_configurable=Test Configurable',`
	`49`	`+ $result['configurable_variation_labels']`
	`50`	`+ );`
`47`	`51`	`}`
`48`	`52`	`}`