From 77c1e3bf2a6bffa1f2b1558df906fd1dcc8e1852 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 10 Aug 2020 10:57:12 +0200
Subject: [PATCH] 1063319 only use standard address location in Organisation
index
---
entity/Organisation_entity/Organisation_entity.aod | 6 +++++-
entity/Organisation_entity/recordcontainers/index/query.js | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 2586777683..75a3286746 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1355,7 +1355,11 @@
<indexFieldMappings>
<indexRecordFieldMapping>
<name>#LOCATION</name>
- <systemField>LOCATION</systemField>
+ <indexFieldType>LOCATION</indexFieldType>
+ <additionalFieldNameAliases>
+ <element>location</element>
+ </additionalFieldNameAliases>
+ <isGlobalSearchField v="false" />
<isFilterable v="false" />
<isLookupFilter v="false" />
</indexRecordFieldMapping>
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index 278616e222..79b1326651 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -24,7 +24,7 @@ var querySelect = newSelect([
sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]),
sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
], " | "),
- sqlHelper.concat([sqlHelper.cast("ADDRESS.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("ADDRESS.LON", SQLTYPES.VARCHAR, 16)], ","),
+ sqlHelper.concat([sqlHelper.cast("defaultAddress.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("defaultAddress.LON", SQLTYPES.VARCHAR, 16)], ","),
//additional indexed fields
"ORGANISATION.NAME",
"ORGANISATION.ORGANISATIONID",
--
GitLab