Commit e5b4e014 authored by bojanz's avatar bojanz
Browse files

Revert two formatting changes introduced in #3087843.

parent 8c45a109
...@@ -201,11 +201,7 @@ class ZoneDefaultFormatter extends FormatterBase implements ContainerFactoryPlug ...@@ -201,11 +201,7 @@ class ZoneDefaultFormatter extends FormatterBase implements ContainerFactoryPlug
]; ];
} }
if ($dependent_locality = $territory->getDependentLocality()) { if ($dependent_locality = $territory->getDependentLocality()) {
$dependent_localities = $this->subdivisionRepository->getList([ $dependent_localities = $this->subdivisionRepository->getList([$country_code, $administrative_area, $locality]);
$country_code,
$administrative_area,
$locality,
]);
$dependent_locality_name = $dependent_locality; $dependent_locality_name = $dependent_locality;
if (isset($dependent_localities[$dependent_locality])) { if (isset($dependent_localities[$dependent_locality])) {
$dependent_locality_name = $dependent_localities[$dependent_locality]; $dependent_locality_name = $dependent_localities[$dependent_locality];
......
...@@ -431,11 +431,7 @@ class AddressDefaultWidgetTest extends WebDriverTestBase { ...@@ -431,11 +431,7 @@ class AddressDefaultWidgetTest extends WebDriverTestBase {
$locality = 'Chengde Shi'; $locality = 'Chengde Shi';
$administrative_areas = $this->subdivisionRepository->getList([$country]); $administrative_areas = $this->subdivisionRepository->getList([$country]);
$localities = $this->subdivisionRepository->getList([$country, $administrative_area]); $localities = $this->subdivisionRepository->getList([$country, $administrative_area]);
$dependent_localities = $this->subdivisionRepository->getList([ $dependent_localities = $this->subdivisionRepository->getList([$country, $administrative_area, $locality]);
$country,
$administrative_area,
$locality,
]);
// Confirm the presence and format of the administrative area dropdown. // Confirm the presence and format of the administrative area dropdown.
$this->drupalGet($this->nodeAddUrl); $this->drupalGet($this->nodeAddUrl);
$this->getSession()->getPage()->fillField($field_name . '[0][address][country_code]', $country); $this->getSession()->getPage()->fillField($field_name . '[0][address][country_code]', $country);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment