From d6813068a29c17bd202e36352474a11d969bbf46 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 8 May 2019 13:30:30 +0200
Subject: [PATCH] Address: adjusted format
---
neonView/AddressList_view/AddressList_view.aod | 8 ++++----
process/PostalAddress_lib/process.js | 6 ++++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index 63782018ac9..47567501426 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -18,6 +18,10 @@
<name>49e14587-34f7-4f09-916c-9eb4aaf55509</name>
<entityField>ADDR_TYPE</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>dfaa01a1-0b11-4f92-aa18-89f12ebb2db5</name>
+ <entityField>COUNTRY</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>4e5e6a4f-f43e-4861-a912-fb05e576f960</name>
<entityField>ADDRESS</entityField>
@@ -34,10 +38,6 @@
<name>12727b21-0359-4430-a9c2-54eb48e2e864</name>
<entityField>CITY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>dfaa01a1-0b11-4f92-aa18-89f12ebb2db5</name>
- <entityField>COUNTRY</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>aafc58cf-7dbb-42cb-b04c-d0869e58d09a</name>
<entityField>STATE</entityField>
diff --git a/process/PostalAddress_lib/process.js b/process/PostalAddress_lib/process.js
index 71de1bb3d79..48d3b89455f 100644
--- a/process/PostalAddress_lib/process.js
+++ b/process/PostalAddress_lib/process.js
@@ -28,7 +28,8 @@ function AddressUtils(){}
*/
AddressUtils.formatOneline = function (pCountry, pAddressLine, pBuildingNo, pZipCode, pCity, pAddressIdentifier)
{
- return StringUtils.concat(", ", [pCountry, pAddressLine, pBuildingNo, pZipCode, pCity, pAddressIdentifier]);
+ //request (and resulting change) was made here to NOT include Country int othe title
+ return StringUtils.concat(", ", [pAddressLine, pBuildingNo, pZipCode, pCity, pAddressIdentifier]);
};
/**
@@ -38,8 +39,9 @@ AddressUtils.formatOneline = function (pCountry, pAddressLine, pBuildingNo, pZip
*/
AddressUtils.formatOnelineSql = function ()
{
+ //request (and resulting change) was made here to NOT include Country int othe title
var maskingHelper = new SqlMaskingUtils();
- var sqlExpression = maskingHelper.concat(["ADDRESS.COUNTRY", "ADDRESS.ADDRESS", "ADDRESS.BUILDINGNO", "ADDRESS.ZIP", "ADDRESS.CITY", "ADDRESS.ADDRIDENTIFIER"], ", ");
+ var sqlExpression = maskingHelper.concat(["ADDRESS.ADDRESS", "ADDRESS.BUILDINGNO", "ADDRESS.ZIP", "ADDRESS.CITY", "ADDRESS.ADDRIDENTIFIER"], ", ");
return sqlExpression;
};
--
GitLab