From a85b341a44d147597cab0e597248d264802416ba Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Tue, 22 Dec 2020 07:47:08 +0100
Subject: [PATCH] [Projekt: Entwicklung - xRM][TicketNr.:
1044463][Unterschiedliche generierte Icons der Initialen in der Suche im
Vergleich zur Vorschau]
---
entity/Organisation_entity/Organisation_entity.aod | 3 +++
entity/Organisation_entity/recordcontainers/index/query.js | 2 +-
entity/Person_entity/Person_entity.aod | 3 +++
entity/Person_entity/recordcontainers/index/query.js | 3 ++-
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 076fe1f621..3c28665b6f 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1807,6 +1807,9 @@
<indexFieldType>ADDRESS</indexFieldType>
<isGlobalSearchField v="false" />
</indexRecordFieldMapping>
+ <indexRecordFieldMapping>
+ <name>PICTURE.value</name>
+ </indexRecordFieldMapping>
</indexFieldMappings>
</indexRecordContainer>
</recordContainers>
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index e26250598e..c2b15cd189 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -42,7 +42,7 @@ var querySelect = newSelect([
sqlHelper.concatWithSeparator([sqlHelper.concatWithSeparator(["standardAddress.ADDRESS", "standardAddress.BUILDINGNO"])
,sqlHelper.concatWithSeparator(["standardAddress.COUNTRY", "standardAddress.ZIP", "standardAddress.CITY"])
], " - ")
- ])
+ , "ORGANISATION.PICTURE"])
.from("ORGANISATION")
.join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
.leftJoin("ADDRESS", "standardAddress.ADDRESSID = CONTACT.ADDRESS_ID", "standardAddress")
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index ccb951171b..4f35bc7bb9 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1837,6 +1837,9 @@
</additionalFieldNameAliases>
<isMultiValued v="true" />
</indexRecordFieldMapping>
+ <indexRecordFieldMapping>
+ <name>PICTURE.value</name>
+ </indexRecordFieldMapping>
</indexFieldMappings>
</indexRecordContainer>
</recordContainers>
diff --git a/entity/Person_entity/recordcontainers/index/query.js b/entity/Person_entity/recordcontainers/index/query.js
index e5c704e81a..61ec0a66cb 100644
--- a/entity/Person_entity/recordcontainers/index/query.js
+++ b/entity/Person_entity/recordcontainers/index/query.js
@@ -38,7 +38,8 @@ var querySelect = newSelect([
"ADDRESS.ZIP",
"ADDRESS.CITY",
"COMMUNICATION.ADDR",
- "PHONE.ADDR"
+ "PHONE.ADDR",
+ "PERSON.PICTURE"
])
.from("PERSON")
.join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID")
--
GitLab