MC-33679: [Cloud] Region name in locale is not showing in customer address details.

tsviklinskyi · tsviklinskyi · commit bbdec92150a8 · 2020-05-20T12:26:06.000+03:00
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
@@ -192,7 +192,11 @@ public function addFieldToFilter($field, $condition = null)
             return $this;
         }
 
-        return parent::addFieldToFilter('main_table.' . $field, $condition);
+        if (is_string($field) && count(explode('.', $field)) === 1) {
+            $field = 'main_table.' . $field;
+        }
+
+        return parent::addFieldToFilter($field, $condition);
     }
 
     /**
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php
@@ -81,7 +81,11 @@ public function addFieldToFilter($field, $condition = null)
             return $this;
         }
 
-        return parent::addFieldToFilter('main_table.' . $field, $condition);
+        if (is_string($field) && count(explode('.', $field)) === 1) {
+            $field = 'main_table.' . $field;
+        }
+
+        return parent::addFieldToFilter($field, $condition);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,11 @@ public function addFieldToFilter($field, $condition = null)`
`192`	`192`	`return $this;`
`193`	`193`	`}`
`194`	`194`
`195`		`- return parent::addFieldToFilter('main_table.' . $field, $condition);`
	`195`	`+ if (is_string($field) && count(explode('.', $field)) === 1) {`
	`196`	`+ $field = 'main_table.' . $field;`
	`197`	`+ }`
	`198`	`+`
	`199`	`+ return parent::addFieldToFilter($field, $condition);`
`196`	`200`	`}`
`197`	`201`
`198`	`202`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,11 @@ public function addFieldToFilter($field, $condition = null)`
`81`	`81`	`return $this;`
`82`	`82`	`}`
`83`	`83`
`84`		`- return parent::addFieldToFilter('main_table.' . $field, $condition);`
	`84`	`+ if (is_string($field) && count(explode('.', $field)) === 1) {`
	`85`	`+ $field = 'main_table.' . $field;`
	`86`	`+ }`
	`87`	`+`
	`88`	`+ return parent::addFieldToFilter($field, $condition);`
`85`	`89`	`}`
`86`	`90`
`87`	`91`	`/**`