From bc4bd9535683ed4f994579791a240785d4f71780 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 18 Jul 2019 12:49:17 +0200
Subject: [PATCH] some salutation fixes, filter fields
---
.../Salutation_entity/Salutation_entity.aod | 7 ++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 1 +
.../SalutationFilter_view.aod | 99 ++++++++++---------
3 files changed, 58 insertions(+), 49 deletions(-)
diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod
index f48c4b8aada..05cfe5add9d 100644
--- a/entity/Salutation_entity/Salutation_entity.aod
+++ b/entity/Salutation_entity/Salutation_entity.aod
@@ -88,18 +88,22 @@
<dbRecordFieldMapping>
<name>HEADLINE.value</name>
<recordfield>SALUTATION.HEADLINE</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LANGUAGE.value</name>
<recordfield>SALUTATION.LANGUAGE</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LETTERSALUTATION.value</name>
<recordfield>SALUTATION.LETTERSALUTATION</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SALUTATION_TEXT.value</name>
<recordfield>SALUTATION.SALUTATION</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SALUTATIONID.value</name>
@@ -108,14 +112,17 @@
<dbRecordFieldMapping>
<name>SEX.value</name>
<recordfield>SALUTATION.SEX</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SORT.value</name>
<recordfield>SALUTATION.SORT</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TITLE.value</name>
<recordfield>SALUTATION.TITLE</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LANGUAGE.displayValue</name>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index a06c5b62d31..d7a7cb3f651 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -5002,6 +5002,7 @@
</entry>
<entry>
<key>Salutations</key>
+ <value>Anreden</value>
</entry>
<entry>
<key>Paymentterm</key>
diff --git a/neonView/SalutationFilter_view/SalutationFilter_view.aod b/neonView/SalutationFilter_view/SalutationFilter_view.aod
index 7cefd8f2f5f..62681de4158 100644
--- a/neonView/SalutationFilter_view/SalutationFilter_view.aod
+++ b/neonView/SalutationFilter_view/SalutationFilter_view.aod
@@ -1,49 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalutationFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Salutations</name>
- <titleField>SALUTATION_TEXT</titleField>
- <subtitleField>TITLE</subtitleField>
- <entityField>#ENTITY</entityField>
- <autoNewRow v="true" />
- <columns>
- <neonTableColumn>
- <name>32e3fa28-1749-45a2-ae77-27ddfb221dba</name>
- <entityField>LANGUAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>9cccf3a4-bbe7-453a-955c-246691c27dba</name>
- <entityField>SALUTATION_TEXT</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>3d4b8959-4558-4398-876a-09b46706827d</name>
- <entityField>TITLE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>f7e7e4a7-5719-457c-ac65-a2cdd993d9fb</name>
- <entityField>HEADLINE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>af9f6db4-f53a-48d8-aaa4-1dc8a6fd211e</name>
- <entityField>LETTERSALUTATION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>071b540d-3d67-4b0b-b382-7c8b3a43e755</name>
- <entityField>SEX</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>b642b2cc-3439-4813-bda7-bb4358247f68</name>
- <entityField>SORT</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SalutationFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Salutations</name>
+ <titleField>SALUTATION_TEXT</titleField>
+ <subtitleField>TITLE</subtitleField>
+ <entityField>#ENTITY</entityField>
+ <autoNewRow v="true" />
+ <columns>
+ <neonTableColumn>
+ <name>32e3fa28-1749-45a2-ae77-27ddfb221dba</name>
+ <entityField>LANGUAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9cccf3a4-bbe7-453a-955c-246691c27dba</name>
+ <entityField>SALUTATION_TEXT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>3d4b8959-4558-4398-876a-09b46706827d</name>
+ <entityField>TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>f7e7e4a7-5719-457c-ac65-a2cdd993d9fb</name>
+ <entityField>HEADLINE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>af9f6db4-f53a-48d8-aaa4-1dc8a6fd211e</name>
+ <entityField>LETTERSALUTATION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>071b540d-3d67-4b0b-b382-7c8b3a43e755</name>
+ <entityField>SEX</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>b642b2cc-3439-4813-bda7-bb4358247f68</name>
+ <entityField>SORT</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
--
GitLab