From 879972e97fd889709ed2b8bc39fd11c70c4b94ae Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 26 Jul 2019 15:59:27 +0200
Subject: [PATCH] rename MEMBER to OBJECTMEMBER
---
.../2019.1.4/update_Salesproject_Member.xml | 4 +-
.../Data_alias/basic/_demoData/changelog.xml | 2 +-
.../{MEMBER.xml => OBJECTMEMBER.xml} | 32 +--
aliasDefinition/Data_alias/Data_alias.aod | 236 +++++++++---------
entity/Member_entity/Member_entity.aod | 32 +--
.../excludedcontactids_param/valueProcess.js | 4 +-
.../valueProcess.js | 0
.../recordcontainers/db/conditionProcess.js | 4 +-
.../recordcontainers/db/fromClauseProcess.js | 2 +-
.../role.displayvalue/expression.js | 2 +-
.../recordcontainers/db/onDBDelete.js | 82 +++---
11 files changed, 200 insertions(+), 200 deletions(-)
rename .liquibase/Data_alias/basic/_demoData/generatedData/{MEMBER.xml => OBJECTMEMBER.xml} (74%)
rename entity/Member_entity/entityfields/{memberid => objectmemberid}/valueProcess.js (100%)
diff --git a/.liquibase/Data_alias/basic/2019.1.4/update_Salesproject_Member.xml b/.liquibase/Data_alias/basic/2019.1.4/update_Salesproject_Member.xml
index fcd45e33c2d..cc5e98d0cfa 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/update_Salesproject_Member.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/update_Salesproject_Member.xml
@@ -10,7 +10,7 @@
</column>
</addColumn>
<renameColumn newColumnName="OBJECT_ROWID" oldColumnName="SALESPROJECT_ID" tableName="SALESPROJECT_MEMBER" columnDataType="CHAR(36)"/>
- <renameColumn newColumnName="MEMBERID" oldColumnName="SALESPROJECT_MEMBERID" tableName="SALESPROJECT_MEMBER" columnDataType="CHAR(36)"/>
+ <renameColumn newColumnName="OBJECTMEMBERID" oldColumnName="SALESPROJECT_MEMBERID" tableName="SALESPROJECT_MEMBER" columnDataType="CHAR(36)"/>
<renameColumn newColumnName="ROLE" oldColumnName="SALESPROJECT_ROLE" tableName="SALESPROJECT_MEMBER" columnDataType="CHAR(36)"/>
<update tableName="SALESPROJECT_MEMBER">
<column name="OBJECT_TYPE" value="Salesproject" />
@@ -22,7 +22,7 @@
columnName="OBJECT_TYPE"
columnDataType="NVARCHAR(63)"/>
- <renameTable oldTableName="SALESPROJECT_MEMBER" newTableName="MEMBER"/>
+ <renameTable oldTableName="SALESPROJECT_MEMBER" newTableName="OBJECTMEMBER"/>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/changelog.xml b/.liquibase/Data_alias/basic/_demoData/changelog.xml
index fadb02846c3..272312eb6df 100644
--- a/.liquibase/Data_alias/basic/_demoData/changelog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/changelog.xml
@@ -19,7 +19,7 @@
<include relativeToChangelogFile="true" file="generatedData/SALESORDERITEM.xml"/>
<include relativeToChangelogFile="true" file="generatedData/SALESPROJECT.xml"/>
<include relativeToChangelogFile="true" file="generatedData/FORECAST.xml"/>
- <include relativeToChangelogFile="true" file="generatedData/MEMBER.xml"/>
+ <include relativeToChangelogFile="true" file="generatedData/OBJECTMEMBER.xml"/>
<include relativeToChangelogFile="true" file="generatedData/SALESPROJECT_MILESTONE.xml"/>
<include relativeToChangelogFile="true" file="generatedData/SALESPROJECT_SOURCE.xml"/>
<include relativeToChangelogFile="true" file="generatedData/TASK.xml"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/OBJECTMEMBER.xml
similarity index 74%
rename from .liquibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/OBJECTMEMBER.xml
index 3c65f994e28..3264baffe0f 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/OBJECTMEMBER.xml
@@ -3,60 +3,60 @@
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="autogenerated" id="9830be31-7d74-46f8-a006-06d25b8229eb">
- <insert tableName="MEMBER">
+ <insert tableName="OBJECTMEMBER">
<column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
- <column name="MEMBERID" value="336e8c10-376c-422e-afd9-1faef77c6f0c"/>
+ <column name="OBJECTMEMBERID" value="336e8c10-376c-422e-afd9-1faef77c6f0c"/>
<column name="ROLE" value="MEMROLEPROJMANAG"/>
</insert>
- <insert tableName="MEMBER">
+ <insert tableName="OBJECTMEMBER">
<column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
- <column name="MEMBERID" value="c3b8a835-e9b2-40d1-aa4d-83838c5714ba"/>
+ <column name="OBJECTMEMBERID" value="c3b8a835-e9b2-40d1-aa4d-83838c5714ba"/>
<column name="ROLE" value="MEMROLEPROJASSIST"/>
</insert>
- <insert tableName="MEMBER">
+ <insert tableName="OBJECTMEMBER">
<column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
- <column name="MEMBERID" value="8d69dc7e-ae24-46e8-b0a0-3217b208c564"/>
+ <column name="OBJECTMEMBERID" value="8d69dc7e-ae24-46e8-b0a0-3217b208c564"/>
<column name="ROLE" value="70cbad1b-eac6-4369-ba50-4946e0fbcb3a"/>
</insert>
- <insert tableName="MEMBER">
+ <insert tableName="OBJECTMEMBER">
<column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
- <column name="MEMBERID" value="685666f6-6545-4a51-8340-d98115b3d710"/>
+ <column name="OBJECTMEMBERID" value="685666f6-6545-4a51-8340-d98115b3d710"/>
<column name="ROLE" value="MEMROLEPROJMANAG"/>
</insert>
- <insert tableName="MEMBER">
+ <insert tableName="OBJECTMEMBER">
<column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
- <column name="MEMBERID" value="3bd6db09-063c-43a5-828d-9fe6e958d142"/>
+ <column name="OBJECTMEMBERID" value="3bd6db09-063c-43a5-828d-9fe6e958d142"/>
<column name="ROLE" value="MEMROLEADVISE"/>
</insert>
- <insert tableName="MEMBER">
+ <insert tableName="OBJECTMEMBER">
<column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
- <column name="MEMBERID" value="100e2d29-2d34-4a5d-adc9-c09f9949d136"/>
+ <column name="OBJECTMEMBERID" value="100e2d29-2d34-4a5d-adc9-c09f9949d136"/>
<column name="ROLE" value="70cbad1b-eac6-4369-ba50-4946e0fbcb3a"/>
</insert>
- <insert tableName="MEMBER">
+ <insert tableName="OBJECTMEMBER">
<column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
- <column name="MEMBERID" value="094fa52f-28ee-4988-9169-c4fcf0fd58e7"/>
+ <column name="OBJECTMEMBERID" value="094fa52f-28ee-4988-9169-c4fcf0fd58e7"/>
<column name="ROLE" value="MEMROLEADVISE"/>
</insert>
- <insert tableName="MEMBER">
+ <insert tableName="OBJECTMEMBER">
<column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
- <column name="MEMBERID" value="b91e741e-6e23-4a0a-a3de-06b9be398ed6"/>
+ <column name="OBJECTMEMBERID" value="b91e741e-6e23-4a0a-a3de-06b9be398ed6"/>
<column name="ROLE" value="MEMROLEEXSALEMANAG"/>
</insert>
</changeSet>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 6d6d8f4c985..39837ae510f 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -9507,124 +9507,6 @@
</entityFieldDb>
</entityFields>
</entityDb>
- <entityDb>
- <name>MEMBER</name>
- <dbName></dbName>
- <idColumn>MEMBERID</idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="1" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
- <entityFieldDb>
- <name>ROLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>OBJECT_ROWID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DECIDER</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>MEMBERID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>CONTACT_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>RELATIONSHIP</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>OBJECT_TYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
<entityDb>
<name>COMMRESTRICTION</name>
<dbName></dbName>
@@ -10811,6 +10693,124 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>OBJECTMEMBER</name>
+ <dbName></dbName>
+ <idColumn>OBJECTMEMBERID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>OBJECTMEMBERID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ROLE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OBJECT_ROWID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DECIDER</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="5" />
+ <size v="5" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CONTACT_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>RELATIONSHIP</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OBJECT_TYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="63" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index bb144449b86..b21777b54c0 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -25,8 +25,8 @@
<displayValueProcess>%aditoprj%/entity/Member_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
- <name>MEMBERID</name>
- <valueProcess>%aditoprj%/entity/Member_entity/entityfields/memberid/valueProcess.js</valueProcess>
+ <name>OBJECTMEMBERID</name>
+ <valueProcess>%aditoprj%/entity/Member_entity/entityfields/objectmemberid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ROLE</name>
@@ -244,30 +244,30 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<conditionProcess>%aditoprj%/entity/Member_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<linkInformation>
<linkInformation>
- <name>dc8d3e38-dd0c-49e1-8665-695e5fd61025</name>
+ <name>b14ff9f6-97cc-4353-b19b-8acd50d56d5c</name>
<tableName>ORGANISATION</tableName>
<primaryKey>ORGANISATIONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
- <name>85c0ae33-0713-4413-aaef-6b0c39b70973</name>
+ <name>85599074-129e-4de8-b2b3-464bcfa8fb40</name>
<tableName>PERSON</tableName>
<primaryKey>PERSONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
- <name>2ee2e445-6b7f-4d22-9a83-1b175ad0acc9</name>
+ <name>ae87b90e-b40d-4472-9bd0-08c080da7f7c</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
- <name>3d675008-56dc-4c91-90c9-7664dccddbb4</name>
- <tableName>MEMBER</tableName>
- <primaryKey>MEMBERID</primaryKey>
+ <name>1455636c-66c8-4100-892d-80e6a37ccd4d</name>
+ <tableName>OBJECTMEMBER</tableName>
+ <primaryKey>OBJECTMEMBERID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
@@ -303,12 +303,12 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
- <recordfield>MEMBER.CONTACT_ID</recordfield>
+ <recordfield>OBJECTMEMBER.CONTACT_ID</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RELATIONSHIP.value</name>
- <recordfield>MEMBER.RELATIONSHIP</recordfield>
+ <recordfield>OBJECTMEMBER.RELATIONSHIP</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
@@ -337,15 +337,15 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OBJECT_ROWID.value</name>
- <recordfield>MEMBER.OBJECT_ROWID</recordfield>
+ <recordfield>OBJECTMEMBER.OBJECT_ROWID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OBJECT_TYPE.value</name>
- <recordfield>MEMBER.OBJECT_TYPE</recordfield>
+ <recordfield>OBJECTMEMBER.OBJECT_TYPE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>MEMBERID.value</name>
- <recordfield>MEMBER.MEMBERID</recordfield>
+ <name>OBJECTMEMBERID.value</name>
+ <recordfield>OBJECTMEMBER.OBJECTMEMBERID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OBJECT_ROWID.displayValue</name>
@@ -353,12 +353,12 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DECIDER.value</name>
- <recordfield>MEMBER.DECIDER</recordfield>
+ <recordfield>OBJECTMEMBER.DECIDER</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ROLE.value</name>
- <recordfield>MEMBER.ROLE</recordfield>
+ <recordfield>OBJECTMEMBER.ROLE</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
diff --git a/entity/Member_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js b/entity/Member_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js
index ff7a12d77a6..f1c9cd6147c 100644
--- a/entity/Member_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js
+++ b/entity/Member_entity/entityfields/contacts/children/excludedcontactids_param/valueProcess.js
@@ -4,6 +4,6 @@ import("system.db");
import("Sql_lib");
result.object(db.array(db.COLUMN, SqlCondition.begin()
- .andPrepare("MEMBER.OBJECT_ROWID", vars.get("$field.OBJECT_ROWID"))
- .buildSql("select CONTACT_ID from MEMBER", "1=2")));
+ .andPrepare("OBJECTMEMBER.OBJECT_ROWID", vars.get("$field.OBJECT_ROWID"))
+ .buildSql("select CONTACT_ID from OBJECTMEMBER", "1=2")));
\ No newline at end of file
diff --git a/entity/Member_entity/entityfields/memberid/valueProcess.js b/entity/Member_entity/entityfields/objectmemberid/valueProcess.js
similarity index 100%
rename from entity/Member_entity/entityfields/memberid/valueProcess.js
rename to entity/Member_entity/entityfields/objectmemberid/valueProcess.js
diff --git a/entity/Member_entity/recordcontainers/db/conditionProcess.js b/entity/Member_entity/recordcontainers/db/conditionProcess.js
index e0f35ab06bb..2d6f617c515 100644
--- a/entity/Member_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Member_entity/recordcontainers/db/conditionProcess.js
@@ -3,8 +3,8 @@ import("system.result");
import("Sql_lib");
var cond = new SqlCondition();
-cond.andPrepareVars("MEMBER.OBJECT_ROWID", "$param.ObjectRowId_param")
-cond.andPrepareVars("MEMBER.OBJECT_TYPE", "$param.ObjectType_param");
+cond.andPrepareVars("OBJECTMEMBER.OBJECT_ROWID", "$param.ObjectRowId_param")
+cond.andPrepareVars("OBJECTMEMBER.OBJECT_TYPE", "$param.ObjectType_param");
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Member_entity/recordcontainers/db/fromClauseProcess.js b/entity/Member_entity/recordcontainers/db/fromClauseProcess.js
index edff7462ed2..9565a4e8b7c 100644
--- a/entity/Member_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Member_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,5 +1,5 @@
import("system.result");
-result.string("MEMBER join CONTACT on (CONTACT.CONTACTID = MEMBER.CONTACT_ID) "
+result.string("OBJECTMEMBER join CONTACT on (CONTACT.CONTACTID = OBJECTMEMBER.CONTACT_ID) "
+ "left join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID) "
+ "left join PERSON on (PERSON.PERSONID = CONTACT.PERSON_ID)");
\ No newline at end of file
diff --git a/entity/Member_entity/recordcontainers/db/recordfieldmappings/role.displayvalue/expression.js b/entity/Member_entity/recordcontainers/db/recordfieldmappings/role.displayvalue/expression.js
index 4e07d5e1138..a86d4135fdf 100644
--- a/entity/Member_entity/recordcontainers/db/recordfieldmappings/role.displayvalue/expression.js
+++ b/entity/Member_entity/recordcontainers/db/recordfieldmappings/role.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.MemberRole(), "MEMBER.ROLE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.MemberRole(), "OBJECTMEMBER.ROLE");
result.string(sql);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
index dc809603263..1012ac8639b 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
@@ -1,42 +1,42 @@
-import("Context_lib");
-import("system.db");
-import("system.vars");
-import("Sql_lib");
-
-var currentId = vars.getString("$field.SALESPROJECTID");
-
-if (currentId)
-{
- var toDelete = [
- "SALESPROJECT_MILESTONE",
- "SALESPROJECT_SOURCE"
- ];
-
-
- toDelete = toDelete.map(function(pTable)
- {
- return [pTable, SqlCondition.equals(pTable + ".SALESPROJECT_ID", currentId, "1=2")];
- });
-
-
-
- var modulesToDelete = [
- "CLASSIFICATION",
- "COMPETITION",
- "MEMBER",
- "FORECAST"
- ];
-
- toDelete = toDelete.concat(modulesToDelete.map(function(pTableComp)
- {
- return [pTableComp, SqlCondition.begin()
- .andPrepare(pTableComp + ".OBJECT_TYPE", ContextUtils.getCurrentContextId())
- .andPrepare(pTableComp + ".OBJECT_ROWID", currentId)
- .build("1=2")];
- }));
-
-
- db.deletes(toDelete);
-
-// TODO: auch Dokumente, Aktivitäten, Aufgaben, Zeiterfassungen löschen?
+import("Context_lib");
+import("system.db");
+import("system.vars");
+import("Sql_lib");
+
+var currentId = vars.getString("$field.SALESPROJECTID");
+
+if (currentId)
+{
+ var toDelete = [
+ "SALESPROJECT_MILESTONE",
+ "SALESPROJECT_SOURCE"
+ ];
+
+
+ toDelete = toDelete.map(function(pTable)
+ {
+ return [pTable, SqlCondition.equals(pTable + ".SALESPROJECT_ID", currentId, "1=2")];
+ });
+
+
+
+ var modulesToDelete = [
+ "CLASSIFICATION",
+ "COMPETITION",
+ "OBJECTMEMBER",
+ "FORECAST"
+ ];
+
+ toDelete = toDelete.concat(modulesToDelete.map(function(pTableComp)
+ {
+ return [pTableComp, SqlCondition.begin()
+ .andPrepare(pTableComp + ".OBJECT_TYPE", ContextUtils.getCurrentContextId())
+ .andPrepare(pTableComp + ".OBJECT_ROWID", currentId)
+ .build("1=2")];
+ }));
+
+
+ db.deletes(toDelete);
+
+// TODO: auch Dokumente, Aktivitäten, Aufgaben, Zeiterfassungen löschen?
}
\ No newline at end of file
--
GitLab