Skip to content

Commit c5a5e07

Browse files
author
Bomko, Alex(abomko)
committed
Merge pull request magento#51 from magento-nord/MAGETWO-43814
[NORD] Fixed MAGETWO-43814
2 parents 1880f58 + efad0cd commit c5a5e07

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

app/code/Magento/CatalogRuleSampleData/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"autoload": {
1616
"files": [ "registration.php" ],
1717
"psr-4": {
18-
"Magento\\CatalogRuleSampleData\\\\": ""
18+
"Magento\\CatalogRuleSampleData\\": ""
1919
}
2020
}
2121
}

app/code/Magento/CatalogSampleData/Model/Product/Gallery.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ protected function storeImage($product, $images)
135135
'position' => $i,
136136
'disables' => 0,
137137
]);
138+
$this->galleryAttribute->bindValueToEntity($id, $product->getId());
138139
$i++;
139140
}
140141

app/code/Magento/ConfigurableSampleData/fixtures/categories.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name,url_key,path,active,is_anchor,include_in_menu,position,display_mode,custom_layout_update
2-
Men,men,,1,0,1,3,PAGE,"<referenceContainer=""catalog.leftnav"" remove=""true""/>"
2+
Men,men,,1,0,1,3,PAGE,"<referenceContainer name=""catalog.leftnav"" remove=""true""/>"
33
Tops,tops-men,Men,1,1,1,,,
44
Bottoms,bottoms-men,Men,1,1,1,,,
55
Jackets,jackets-men,Men/Tops,1,1,1,,,
@@ -8,7 +8,7 @@ Tees,tees-men,Men/Tops,1,1,1,,,
88
Tanks,tanks-men,Men/Tops,1,1,1,,,
99
Pants,pants-men,Men/Bottoms,1,1,1,,,
1010
Shorts,shorts-men,Men/Bottoms,1,1,1,,,
11-
Women,women,,1,0,1,2,PAGE,"<referenceContainer=""catalog.leftnav"" remove=""true""/>"
11+
Women,women,,1,0,1,2,PAGE,"<referenceContainer name=""catalog.leftnav"" remove=""true""/>"
1212
Tops,tops-women,Women,1,1,1,,,
1313
Bottoms,bottoms-women,Women,1,1,1,,,
1414
Jackets,jackets-women,Women/Tops,1,1,1,,,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
name,url_key,path,active,is_anchor,include_in_menu,position,display_mode,custom_layout_update,require_media
2-
Training,training,,1,0,1,5,PAGE,"<referenceContainer=""catalog.leftnav"" remove=""true""/>",1
2+
Training,training,,1,0,1,5,PAGE,"<referenceContainer name=""catalog.leftnav"" remove=""true""/>",1
33
"Video Download",training-video,Training,1,1,1,,,,1

app/code/Magento/ProductLinksSampleData/composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-product-link": "1.0.0-beta",
76
"magento/module-catalog-sample-data": "1.0.0-beta",
87
"magento/module-sample-data": "1.0.0-beta"
98
},

0 commit comments

Comments
 (0)