Skip to content

Commit 414c50c

Browse files
committed
Merge branch 'MAGETWO-61560' of https://github.com/magento-nord/magento2ce into MAGETWO-61560
2 parents 0cd328a + 11089f0 commit 414c50c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ConfigurablePriceTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public function metaDataProvider()
6464
'config' => [
6565
'visible' => 0,
6666
'disabled' => 1,
67+
'componentType' => 'container'
6768
],
6869
],
6970
],

app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePrice.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,16 @@ public function modifyMeta(array $meta)
8484
. ConfigurablePanel::CONFIGURABLE_MATRIX . ':isEmpty',
8585
]
8686
];
87+
$config = $visibilityConfig;
88+
$config['componentType'] = 'container';
8789
$meta[$groupCode]['children'][self::CODE_GROUP_PRICE] = array_replace_recursive(
8890
$meta[$groupCode]['children'][self::CODE_GROUP_PRICE],
8991
[
9092
'children' => [
9193
self::$advancedPricingButton => [
9294
'arguments' => [
9395
'data' => [
94-
'config' => [
95-
'componentType' => 'container',
96-
$visibilityConfig
97-
],
96+
'config' => $config,
9897
],
9998
],
10099
],

0 commit comments

Comments
 (0)