Skip to content
Snippets Groups Projects
Commit 96f75f66 authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

MS-Teams: Bugfixing

parent 8c2d86be
No related branches found
No related tags found
No related merge requests found
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
<customJDitoProperty> <customJDitoProperty>
<name>translate4Log</name> <name>translate4Log</name>
<global v="false" /> <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> </customJDitoProperty>
</customProperties> </customProperties>
</entityFieldDb> </entityFieldDb>
...@@ -1760,10 +1760,11 @@ ...@@ -1760,10 +1760,11 @@
<global v="false" /> <global v="false" />
<property v="true" /> <property v="true" />
</customBooleanProperty> </customBooleanProperty>
<customStringProperty> <customJDitoProperty>
<name>translate4Log</name> <name>translate4Log</name>
<global v="false" /> <global v="false" />
</customStringProperty> <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/product/entityfields/contact_id/customproperties/translate4log/property.js</property>
</customJDitoProperty>
</customProperties> </customProperties>
</entityFieldDb> </entityFieldDb>
<entityFieldDb> <entityFieldDb>
...@@ -2191,6 +2192,11 @@ ...@@ -2191,6 +2192,11 @@
<global v="false" /> <global v="false" />
<property v="true" /> <property v="true" />
</customBooleanProperty> </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> </customProperties>
</entityFieldDb> </entityFieldDb>
<entityFieldDb> <entityFieldDb>
......
import("system.translate");
import("system.teams"); import("system.teams");
import("system.result"); import("system.result");
import("system.vars"); import("system.vars");
......
...@@ -2,10 +2,6 @@ ...@@ -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"> <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> <name>MSTTeam_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
<siblings>
<element>Salesproject_entity</element>
<element>Member_entity</element>
</siblings>
<grantUpdateProcess>%aditoprj%/entity/MSTTeam_entity/grantUpdateProcess.js</grantUpdateProcess> <grantUpdateProcess>%aditoprj%/entity/MSTTeam_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/MSTTeam_entity/grantDeleteProcess.js</grantDeleteProcess> <grantDeleteProcess>%aditoprj%/entity/MSTTeam_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/MSTTeam_entity/contentTitleProcess.js</contentTitleProcess> <contentTitleProcess>%aditoprj%/entity/MSTTeam_entity/contentTitleProcess.js</contentTitleProcess>
......
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
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
<selectionMode>MULTI</selectionMode> <selectionMode>MULTI</selectionMode>
<dependency> <dependency>
<name>dependency</name> <name>dependency</name>
<entityName>MSTTeamsMessage_entity</entityName>
<fieldName>Messages</fieldName>
</dependency> </dependency>
<children> <children>
<entityParameter> <entityParameter>
...@@ -84,7 +82,6 @@ ...@@ -84,7 +82,6 @@
<name>jdito</name> <name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias> <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/MSTeamsActivityImport_entity/recordcontainers/jdito/contentProcess.js</contentProcess> <contentProcess>%aditoprj%/entity/MSTeamsActivityImport_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/MSTeamsActivityImport_entity/recordcontainers/jdito/onInsert.js</onInsert>
<recordFieldMappings> <recordFieldMappings>
<jDitoRecordFieldMapping> <jDitoRecordFieldMapping>
<name>UID.value</name> <name>UID.value</name>
......
import("system.vars");
import("MSTeams_lib");
import("system.result"); import("system.result");
import("Sql_lib"); import("Sql_lib");
......
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Member_entity/documentation.adoc</documentation> <documentation>%aditoprj%/entity/Member_entity/documentation.adoc</documentation>
<title>${SALESPROJECT_MEMBER}</title> <title>${SALESPROJECT_MEMBER}</title>
<siblings /> <siblings>
<element>MSTTeam_entity</element>
</siblings>
<contentTitleProcess>%aditoprj%/entity/Member_entity/contentTitleProcess.js</contentTitleProcess> <contentTitleProcess>%aditoprj%/entity/Member_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:FILE_SOUND</iconId> <iconId>VAADIN:FILE_SOUND</iconId>
<titlePlural>${SALESPROJECT_MEMBER}</titlePlural> <titlePlural>${SALESPROJECT_MEMBER}</titlePlural>
...@@ -182,6 +184,12 @@ ...@@ -182,6 +184,12 @@
<fieldName>MemberConsumer</fieldName> <fieldName>MemberConsumer</fieldName>
<isConsumer v="false" /> <isConsumer v="false" />
</entityDependency> </entityDependency>
<entityDependency>
<name>d97ada32-2043-4ebb-a53b-1b468cf6ad39</name>
<entityName>Salesproject_entity</entityName>
<fieldName>Members</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies> </dependencies>
</entityProvider> </entityProvider>
<entityField> <entityField>
...@@ -202,14 +210,6 @@ ...@@ -202,14 +210,6 @@
<entityProvider> <entityProvider>
<name>WithDistrictResponsibles</name> <name>WithDistrictResponsibles</name>
<recordContainer>jdito</recordContainer> <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> </entityProvider>
<entityField> <entityField>
<name>UID</name> <name>UID</name>
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<siblings> <siblings>
<element>SalesprojectMilestone_entity</element> <element>SalesprojectMilestone_entity</element>
<element>Member_entity</element> <element>Member_entity</element>
<element>MSTTeam_entity</element>
</siblings> </siblings>
<grantDeleteProcess>%aditoprj%/entity/Salesproject_entity/grantDeleteProcess.js</grantDeleteProcess> <grantDeleteProcess>%aditoprj%/entity/Salesproject_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Salesproject_entity/contentTitleProcess.js</contentTitleProcess> <contentTitleProcess>%aditoprj%/entity/Salesproject_entity/contentTitleProcess.js</contentTitleProcess>
...@@ -258,7 +259,7 @@ ...@@ -258,7 +259,7 @@
<dependency> <dependency>
<name>dependency</name> <name>dependency</name>
<entityName>Member_entity</entityName> <entityName>Member_entity</entityName>
<fieldName>WithDistrictResponsibles</fieldName> <fieldName>Links</fieldName>
</dependency> </dependency>
<children> <children>
<entityParameter> <entityParameter>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment