From 95fe974254e478de3260f5f348318d89699fde79 Mon Sep 17 00:00:00 2001 From: Johannes Hoermann <j.hoermann@adito.de> Date: Thu, 28 Feb 2019 08:50:18 +0100 Subject: [PATCH] umbau --- .../Salutation_entity/Salutation_entity.aod | 14 +++++- .../SalutationLookup_view.aod | 48 +++++++++---------- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod index 1266da67e73..45b480dcafe 100644 --- a/entity/Salutation_entity/Salutation_entity.aod +++ b/entity/Salutation_entity/Salutation_entity.aod @@ -70,9 +70,9 @@ <entityProvider> <name>Salutations</name> <fieldType>DEPENDENCY_IN</fieldType> - <lookupIdfield>SALUTATION</lookupIdfield> + <lookupIdfield>UID</lookupIdfield> <titleProcess>%aditoprj%/entity/Salutation_entity/entityfields/salutations/titleProcess.js</titleProcess> - <recordContainer>db</recordContainer> + <recordContainer>distinctSalutation_jdito</recordContainer> <dependencies> <entityDependency> <name>e3e73780-d3b2-4e31-8e09-6a778c5d63a2</name> @@ -109,6 +109,9 @@ <triggerRecalculation v="true" /> <description>PARAMETER</description> </entityParameter> + <entityField> + <name>UID</name> + </entityField> </entityFields> <recordContainers> <dbRecordContainer> @@ -167,5 +170,12 @@ </dbRecordFieldMapping> </recordFieldMappings> </dbRecordContainer> + <jDitoRecordContainer> + <name>distinctSalutation_jdito</name> + <jDitoRecordAlias>Data_alias</jDitoRecordAlias> + <recordFields> + <element>UID.value</element> + </recordFields> + </jDitoRecordContainer> </recordContainers> </entity> diff --git a/neonView/SalutationLookup_view/SalutationLookup_view.aod b/neonView/SalutationLookup_view/SalutationLookup_view.aod index bd33469ea0a..079f7308618 100644 --- a/neonView/SalutationLookup_view/SalutationLookup_view.aod +++ b/neonView/SalutationLookup_view/SalutationLookup_view.aod @@ -1,26 +1,22 @@ -<?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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1"> - <name>SalutationLookup_view</name> - <majorModelMode>DISTRIBUTED</majorModelMode> - <layout> - <boxLayout> - <name>layout</name> - </boxLayout> - </layout> - <children> - <tableViewTemplate> - <name>Table</name> - <entityField>#ENTITY</entityField> - <columns> - <neonTableColumn> - <name>fbf20ad5-75b0-4c5c-8fbf-a2c0369f2adc</name> - <entityField>SALUTATION</entityField> - </neonTableColumn> - <neonTableColumn> - <name>ba27a68a-f353-4365-8127-e3a652137a10</name> - <entityField>TITLE</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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1"> + <name>SalutationLookup_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <tableViewTemplate> + <name>Table</name> + <entityField>#ENTITY</entityField> + <columns> + <neonTableColumn> + <name>fbf20ad5-75b0-4c5c-8fbf-a2c0369f2adc</name> + <entityField>UID</entityField> + </neonTableColumn> + </columns> + </tableViewTemplate> + </children> +</neonView> -- GitLab