Skip to content

Commit 3a24ef6

Browse files
author
Alexander Paliarush
committed
MAGETWO-53159: [GitHub] Country of Manufacture drop down is limited #4579
1 parent a1d3f04 commit 3a24ef6

File tree

2 files changed

+5
-13
lines changed
  • dev/tests/functional/tests/app/Magento

2 files changed

+5
-13
lines changed

dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -209,16 +209,7 @@
209209
<field name="general/country/allow" xsi:type="array">
210210
<item name="scope" xsi:type="string">default</item>
211211
<item name="scope_id" xsi:type="number">0</item>
212-
<item name="value" xsi:type="array">
213-
<item name="Antarctica" xsi:type="string">AQ</item>
214-
<item name="Canada" xsi:type="string">CA</item>
215-
<item name="France" xsi:type="string">FR</item>
216-
<item name="Germany" xsi:type="string">DE</item>
217-
<item name="Italy" xsi:type="string">IT</item>
218-
<item name="Ukraine" xsi:type="string">UA</item>
219-
<item name="United Kingdom" xsi:type="string">GB</item>
220-
<item name="United States" xsi:type="string">US</item>
221-
</item>
212+
<item name="inherit" xsi:type="string">1</item>
222213
</field>
223214
</dataset>
224215
</repository>

dev/tests/functional/tests/app/Magento/Config/Test/Handler/ConfigData/Curl.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,16 @@ protected function prepareConfigPath(array $input)
8989
}
9090
$resultArray .= '[' . $subPath . ']';
9191
}
92-
$resultArray .= '[value]';
93-
if (is_array($input['value'])) {
92+
$valueCode = isset($input['inherit']) ? 'inherit' : 'value';
93+
$resultArray .= "[$valueCode]";
94+
if (isset($input['value']) && is_array($input['value'])) {
9495
$values = [];
9596
foreach ($input['value'] as $key => $value) {
9697
$values[] = $resultArray . "[$key]=$value";
9798
}
9899
$resultArray = implode('&', $values);
99100
} else {
100-
$resultArray .= '=' . $input['value'];
101+
$resultArray .= '=' . $input[$valueCode];
101102
}
102103
return $resultArray;
103104
}

0 commit comments

Comments
 (0)