Skip to content
Snippets Groups Projects
Commit d688dc0f authored by Daniel Tran's avatar Daniel Tran Committed by Sebastian Pongratz
Browse files

[Projekt: xRM-ContactManagement][TicketNr.: 1075174][Kontakt - Beziehung... 

[Projekt: xRM-ContactManagement][TicketNr.: 1075174][Kontakt - Beziehung Werbezielgruppe - ID als Link angezeigt, Fehlermeldung beim klick auf die ID]
- Fixed permuted if-statement.
parent 32decc25
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 61 additions and 11 deletions
.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
+ 4
− 4
View file @ d688dc0f
......@@ -41,7 +41,7 @@
<insert tableName="ab_objectrelationtype">
<column name="SIDE" valueNumeric="1"/>
<column name="AB_OBJECTRELATIONTYPEID" value="39e73949-c8d9-46a2-a0b5-18be95e7ba11"/>
<column name="OBJECT_TYPE" value="PrivatePerson"/>
<column name="OBJECT_TYPE" value="Person"/>
<column name="HIERARCHY" valueNumeric="0"/>
<column name="ICON" value="VAADIN:FAMILY"/>
<column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
......@@ -86,7 +86,7 @@
<insert tableName="ab_objectrelationtype">
<column name="SIDE" valueNumeric="2"/>
<column name="AB_OBJECTRELATIONTYPEID" value="a2296f93-2371-4ab8-9f29-ef0795d1e9b2"/>
<column name="OBJECT_TYPE" value="PrivatePerson"/>
<column name="OBJECT_TYPE" value="Person"/>
<column name="HIERARCHY" valueNumeric="0"/>
<column name="ICON" value="VAADIN:FAMILY"/>
<column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
......@@ -104,7 +104,7 @@
<insert tableName="ab_objectrelationtype">
<column name="SIDE" valueNumeric="2"/>
<column name="AB_OBJECTRELATIONTYPEID" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
<column name="OBJECT_TYPE" value="PrivatePerson"/>
<column name="OBJECT_TYPE" value="Person"/>
<column name="HIERARCHY" valueNumeric="0"/>
<column name="ICON" value="VAADIN:FAMILY"/>
<column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
......@@ -122,7 +122,7 @@
<insert tableName="ab_objectrelationtype">
<column name="SIDE" valueNumeric="1"/>
<column name="AB_OBJECTRELATIONTYPEID" value="c74ad02c-1db9-4f47-8691-aba349dbe316"/>
<column name="OBJECT_TYPE" value="PrivatePerson"/>
<column name="OBJECT_TYPE" value="Person"/>
<column name="HIERARCHY" valueNumeric="0"/>
<column name="ICON" value="VAADIN:FAMILY"/>
<column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
......
entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+ 14
− 3
View file @ d688dc0f
......@@ -66,7 +66,7 @@
</entityField>
<entityField>
<name>DEST_OBJECT_TYPE</name>
<title>Context 2</title>
<title>Object type 2</title>
<consumer>Contexts</consumer>
<mandatoryProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_object_type/mandatoryProcess.js</mandatoryProcess>
<stateProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_object_type/stateProcess.js</stateProcess>
......@@ -74,7 +74,7 @@
</entityField>
<entityField>
<name>SOURCE_OBJECT_TYPE</name>
<title>Context 1</title>
<title>Object type 1</title>
<consumer>Contexts</consumer>
<mandatory v="true" />
<stateProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/source_object_type/stateProcess.js</stateProcess>
......@@ -104,8 +104,19 @@
<dependency>
<name>dependency</name>
<entityName>Context_entity</entityName>
<fieldName>Context</fieldName>
<fieldName>Exclusive</fieldName>
</dependency>
<children>
<entityParameter>
<name>Blacklist_param</name>
<valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/contexts/children/blacklist_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>InvertBlacklist_param</name>
<valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js</valueProcess>
<documentation>%aditoprj%/entity/ObjectRelationType_entity/entityfields/contexts/children/invertblacklist_param/documentation.adoc</documentation>
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>Type2Enabled_proxy</name>
......
entity/ObjectRelationType_entity/entityfields/contexts/children/blacklist_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ d688dc0f
import("system.result");
result.string(JSON.stringify(["Organisation", "Person"]));
\ No newline at end of file
entity/ObjectRelationType_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ d688dc0f
import("system.result");
result.string("true");
\ No newline at end of file
entity/ObjectTree_entity/ObjectTree_entity.aod
+ 1
− 0
View file @ d688dc0f
......@@ -18,6 +18,7 @@
<name>TreeProvider</name>
<targetContextField>TARGET_CONTEXT</targetContextField>
<targetIdField>TARGET_ID</targetIdField>
<documentation>%aditoprj%/entity/ObjectTree_entity/entityfields/treeprovider/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>f4c0605f-3ccb-4ff1-b460-7268e8553857</name>
......
entity/ObjectTree_entity/entityfields/target_context/valueProcess.js
+ 1
− 4
View file @ d688dc0f
......@@ -6,8 +6,5 @@ import("ObjectRelation_lib");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
var relationType = ObjectRelationUtils.getRelationType(vars.get("$field.OBJECTRELATIONTYPEID"));
if(relationType[3] == "reverse")
result.string(ObjectRelationUtils.getRelationType(vars.get("$field.OBJECTRELATIONTYPEID"))[5]);
else
result.string(ObjectRelationUtils.getRelationType(vars.get("$field.OBJECTRELATIONTYPEID"))[6]);
result.string(ObjectRelationUtils.getRelationType(vars.get("$field.OBJECTRELATIONTYPEID"))[6]);
}
\ No newline at end of file
entity/ObjectTree_entity/entityfields/treeprovider/documentation.adoc 0 → 100644
+ 3
− 0
View file @ d688dc0f
Provides the data, which is needed for building the tree,
which represents the relation between persons and organisations
(e.g.: person A "supports" person B and person B is "supported by" person A).
\ No newline at end of file
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 12
− 0
View file @ d688dc0f
......@@ -8563,6 +8563,18 @@
<entry>
<key>Source / origin of the generation of contacts</key>
</entry>
<entry>
<key>Object type 1</key>
</entry>
<entry>
<key>Object type 2</key>
</entry>
<entry>
<key>A communication setting for this channel already exists!</key>
</entry>
<entry>
<key>This setting is overridden by the setting '%0'</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 8
− 0
View file @ d688dc0f
......@@ -11272,6 +11272,14 @@ Bitte Datumseingabe prüfen</value>
<key>Post office box number</key>
<value>Postfachnummer</value>
</entry>
<entry>
<key>Object type 1</key>
<value>Objekttyp 1</value>
</entry>
<entry>
<key>Object type 2</key>
<value>Objekttyp 2</value>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 12
− 0
View file @ d688dc0f
......@@ -8648,6 +8648,18 @@
<entry>
<key>Source / origin of the generation of contacts</key>
</entry>
<entry>
<key>Object type 1</key>
</entry>
<entry>
<key>Object type 2</key>
</entry>
<entry>
<key>A communication setting for this channel already exists!</key>
</entry>
<entry>
<key>This setting is overridden by the setting '%0'</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment