Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
address
Commits
e5b4e014
Commit
e5b4e014
authored
Mar 19, 2020
by
bojanz
Browse files
Revert two formatting changes introduced in
#3087843
.
parent
8c45a109
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Plugin/Field/FieldFormatter/ZoneDefaultFormatter.php
View file @
e5b4e014
...
...
@@ -201,11 +201,7 @@ class ZoneDefaultFormatter extends FormatterBase implements ContainerFactoryPlug
];
}
if
(
$dependent_locality
=
$territory
->
getDependentLocality
())
{
$dependent_localities
=
$this
->
subdivisionRepository
->
getList
([
$country_code
,
$administrative_area
,
$locality
,
]);
$dependent_localities
=
$this
->
subdivisionRepository
->
getList
([
$country_code
,
$administrative_area
,
$locality
]);
$dependent_locality_name
=
$dependent_locality
;
if
(
isset
(
$dependent_localities
[
$dependent_locality
]))
{
$dependent_locality_name
=
$dependent_localities
[
$dependent_locality
];
...
...
tests/src/FunctionalJavascript/AddressDefaultWidgetTest.php
View file @
e5b4e014
...
...
@@ -431,11 +431,7 @@ class AddressDefaultWidgetTest extends WebDriverTestBase {
$locality
=
'Chengde Shi'
;
$administrative_areas
=
$this
->
subdivisionRepository
->
getList
([
$country
]);
$localities
=
$this
->
subdivisionRepository
->
getList
([
$country
,
$administrative_area
]);
$dependent_localities
=
$this
->
subdivisionRepository
->
getList
([
$country
,
$administrative_area
,
$locality
,
]);
$dependent_localities
=
$this
->
subdivisionRepository
->
getList
([
$country
,
$administrative_area
,
$locality
]);
// Confirm the presence and format of the administrative area dropdown.
$this
->
drupalGet
(
$this
->
nodeAddUrl
);
$this
->
getSession
()
->
getPage
()
->
fillField
(
$field_name
.
'[0][address][country_code]'
,
$country
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment