From 96f75f66b85fe24f64a15ef6a1e09fed5a72de78 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 15 Sep 2020 12:42:54 +0200
Subject: [PATCH] MS-Teams: Bugfixing
---
aliasDefinition/Data_alias/Data_alias.aod | 12 +++++++++---
.../recordcontainers/jdito/contentProcess.js | 1 +
entity/MSTTeam_entity/MSTTeam_entity.aod | 4 ----
entity/MSTTeam_entity/afterSave.js | 4 ----
.../MSTeamsActivityImport_entity.aod | 3 ---
.../entityfields/team_id/valueProcess.js | 2 ++
.../recordcontainers/jdito/onInsert.js | 0
entity/Member_entity/Member_entity.aod | 18 +++++++++---------
.../Salesproject_entity.aod | 3 ++-
9 files changed, 23 insertions(+), 24 deletions(-)
delete mode 100644 entity/MSTeamsActivityImport_entity/recordcontainers/jdito/onInsert.js
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 097c01e9ccf..eeae4a15898 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -261,7 +261,7 @@
<customJDitoProperty>
<name>translate4Log</name>
<global v="false" />
- <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/language/customproperties/translate4log/property.js</property>
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/contact/entityfields/isolanguage/customproperties/translate4log/property.js</property>
</customJDitoProperty>
</customProperties>
</entityFieldDb>
@@ -1760,10 +1760,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
- <customStringProperty>
+ <customJDitoProperty>
<name>translate4Log</name>
<global v="false" />
- </customStringProperty>
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
@@ -2191,6 +2192,11 @@
<global v="false" />
<property v="true" />
</customBooleanProperty>
+ <customJDitoProperty>
+ <name>translate4Log</name>
+ <global v="false" />
+ <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/productprice/entityfields/contact_id/customproperties/translate4log/property.js</property>
+ </customJDitoProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
diff --git a/entity/MSTTeamMember_entity/recordcontainers/jdito/contentProcess.js b/entity/MSTTeamMember_entity/recordcontainers/jdito/contentProcess.js
index 11d1d65919c..3a44cd419e0 100644
--- a/entity/MSTTeamMember_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/MSTTeamMember_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.translate");
import("system.teams");
import("system.result");
import("system.vars");
diff --git a/entity/MSTTeam_entity/MSTTeam_entity.aod b/entity/MSTTeam_entity/MSTTeam_entity.aod
index f45825bd7d6..10735e065bf 100644
--- a/entity/MSTTeam_entity/MSTTeam_entity.aod
+++ b/entity/MSTTeam_entity/MSTTeam_entity.aod
@@ -2,10 +2,6 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>MSTTeam_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <siblings>
- <element>Salesproject_entity</element>
- <element>Member_entity</element>
- </siblings>
<grantUpdateProcess>%aditoprj%/entity/MSTTeam_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/MSTTeam_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/MSTTeam_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/MSTTeam_entity/afterSave.js b/entity/MSTTeam_entity/afterSave.js
index eeeb0cbd2a4..e69de29bb2d 100644
--- a/entity/MSTTeam_entity/afterSave.js
+++ b/entity/MSTTeam_entity/afterSave.js
@@ -1,4 +0,0 @@
-import("system.neon");
-
-//TODO: this should not be necessary, check why the siblings don't work here
-neon.refreshAll();
\ No newline at end of file
diff --git a/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod b/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
index 82434544226..75900dda74e 100644
--- a/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
+++ b/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
@@ -16,8 +16,6 @@
<selectionMode>MULTI</selectionMode>
<dependency>
<name>dependency</name>
- <entityName>MSTTeamsMessage_entity</entityName>
- <fieldName>Messages</fieldName>
</dependency>
<children>
<entityParameter>
@@ -84,7 +82,6 @@
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/MSTeamsActivityImport_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/MSTeamsActivityImport_entity/recordcontainers/jdito/onInsert.js</onInsert>
<recordFieldMappings>
<jDitoRecordFieldMapping>
<name>UID.value</name>
diff --git a/entity/MSTeamsActivityImport_entity/entityfields/team_id/valueProcess.js b/entity/MSTeamsActivityImport_entity/entityfields/team_id/valueProcess.js
index 1f7366af28d..c431bd3ac3e 100644
--- a/entity/MSTeamsActivityImport_entity/entityfields/team_id/valueProcess.js
+++ b/entity/MSTeamsActivityImport_entity/entityfields/team_id/valueProcess.js
@@ -1,3 +1,5 @@
+import("system.vars");
+import("MSTeams_lib");
import("system.result");
import("Sql_lib");
diff --git a/entity/MSTeamsActivityImport_entity/recordcontainers/jdito/onInsert.js b/entity/MSTeamsActivityImport_entity/recordcontainers/jdito/onInsert.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index fea67a119b7..47bf2599e3a 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -4,7 +4,9 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Member_entity/documentation.adoc</documentation>
<title>${SALESPROJECT_MEMBER}</title>
- <siblings />
+ <siblings>
+ <element>MSTTeam_entity</element>
+ </siblings>
<contentTitleProcess>%aditoprj%/entity/Member_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:FILE_SOUND</iconId>
<titlePlural>${SALESPROJECT_MEMBER}</titlePlural>
@@ -182,6 +184,12 @@
<fieldName>MemberConsumer</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>d97ada32-2043-4ebb-a53b-1b468cf6ad39</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Members</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityField>
@@ -202,14 +210,6 @@
<entityProvider>
<name>WithDistrictResponsibles</name>
<recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>6f90b6c6-118c-485e-9a41-365bdc325f9b</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Members</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>UID</name>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index a04269fdb7a..b2cf87ec299 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -7,6 +7,7 @@
<siblings>
<element>SalesprojectMilestone_entity</element>
<element>Member_entity</element>
+ <element>MSTTeam_entity</element>
</siblings>
<grantDeleteProcess>%aditoprj%/entity/Salesproject_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Salesproject_entity/contentTitleProcess.js</contentTitleProcess>
@@ -258,7 +259,7 @@
<dependency>
<name>dependency</name>
<entityName>Member_entity</entityName>
- <fieldName>WithDistrictResponsibles</fieldName>
+ <fieldName>Links</fieldName>
</dependency>
<children>
<entityParameter>
--
GitLab