diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod index c9bad862b06f3f5dafe664a915461139bb590463..e95bbe7da57a4f4285d84a7c2648efc132a85207 100644 --- a/entity/Attribute_entity/Attribute_entity.aod +++ b/entity/Attribute_entity/Attribute_entity.aod @@ -124,6 +124,10 @@ <name>ATTRIBUTE_ACTIVE.value</name> <recordfield>AB_ATTRIBUTE.ATTRIBUTE_ACTIVE</recordfield> </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>ATTRIBUTE_TYPE.displayValue</name> + <expression>%aditoprj%/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js</expression> + </dbRecordFieldMapping> </recordFieldMappings> </dbRecordContainer> </recordContainers> diff --git a/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js b/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js new file mode 100644 index 0000000000000000000000000000000000000000..8c745d3aa3627911fb2de2138a2381f8870a32a1 --- /dev/null +++ b/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js @@ -0,0 +1,5 @@ +import("system.result"); +import("Keyword_lib"); + +var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.AttributeType, "AB_ATTRIBUTE.ATTRIBUTE_TYPE"); +result.string(sql); \ No newline at end of file diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod index 9b412db0ba34ff0ae82a333b0d8ad6961f56c46c..d82728e21c7188569a12c24423b3fde844546ff5 100644 --- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod +++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod @@ -30,6 +30,8 @@ <entityProvider> <name>SalesprojectMembers</name> <fieldType>DEPENDENCY_IN</fieldType> + <targetContextField>TARGETCONTEXT</targetContextField> + <targetIdField>CONTACT_ID</targetIdField> <recordContainer>db</recordContainer> <dependencies> <entityDependency> @@ -145,6 +147,10 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt </entityParameter> </children> </entityConsumer> + <entityField> + <name>TARGETCONTEXT</name> + <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js</valueProcess> + </entityField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..b8a7cf8b360661e7993c91dcaa3a9fabcbab989b --- /dev/null +++ b/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js @@ -0,0 +1,2 @@ +import("system.result"); +result.string("Person_context"); //to show the preview of the person \ No newline at end of file diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml index af039c84bed9b5847476a55ebc737c1a6f66cb31..958ebbabbff6c47cd11ca96e801f36a7963eb0fd 100644 --- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml +++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml @@ -42,7 +42,7 @@ <column name="KEYID" value="COMBO"/> <column name="TITLE" value="Combobox"/> <column name="CONTAINER" value="AttributeType"/> - <column name="SORTING" valueNumeric="3"/> + <column name="SORTING" valueNumeric="4"/> <column name="ISACTIVE" valueNumeric="1"/> <column name="ISESSENTIAL" valueNumeric="0"/> </insert> @@ -51,7 +51,7 @@ <column name="KEYID" value="GROUP"/> <column name="TITLE" value="Group"/> <column name="CONTAINER" value="AttributeType"/> - <column name="SORTING" valueNumeric="3"/> + <column name="SORTING" valueNumeric="5"/> <column name="ISACTIVE" valueNumeric="1"/> <column name="ISESSENTIAL" valueNumeric="0"/> </insert>