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 cc5e98d0cfad2c6b4267921f59b189cd708f2158..56744dc5078e2a1355435a01cf03c504a8bb5677 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
@@ -11,7 +11,7 @@
</addColumn>
<renameColumn newColumnName="OBJECT_ROWID" oldColumnName="SALESPROJECT_ID" 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)"/>
+ <renameColumn newColumnName="MEMBERROLE" oldColumnName="SALESPROJECT_MEMBERROLE" tableName="SALESPROJECT_MEMBER" columnDataType="CHAR(36)"/>
<update tableName="SALESPROJECT_MEMBER">
<column name="OBJECT_TYPE" value="Salesproject" />
<where>OBJECT_ROWID = '0833465c-8851-4fbb-b7e3-8c1d73c903da'</where>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/OBJECTMEMBER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/OBJECTMEMBER.xml
index 3264baffe0faed35d4a6e7e50cb2e35d80369863..75dc704dff44f5141eb98e6d0681d114b5c61027 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/OBJECTMEMBER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/OBJECTMEMBER.xml
@@ -8,56 +8,56 @@
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="OBJECTMEMBERID" value="336e8c10-376c-422e-afd9-1faef77c6f0c"/>
- <column name="ROLE" value="MEMROLEPROJMANAG"/>
+ <column name="MEMBERROLE" value="MEMROLEPROJMANAG"/>
</insert>
<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="OBJECTMEMBERID" value="c3b8a835-e9b2-40d1-aa4d-83838c5714ba"/>
- <column name="ROLE" value="MEMROLEPROJASSIST"/>
+ <column name="MEMBERROLE" value="MEMROLEPROJASSIST"/>
</insert>
<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="OBJECTMEMBERID" value="8d69dc7e-ae24-46e8-b0a0-3217b208c564"/>
- <column name="ROLE" value="70cbad1b-eac6-4369-ba50-4946e0fbcb3a"/>
+ <column name="MEMBERROLE" value="70cbad1b-eac6-4369-ba50-4946e0fbcb3a"/>
</insert>
<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="OBJECTMEMBERID" value="685666f6-6545-4a51-8340-d98115b3d710"/>
- <column name="ROLE" value="MEMROLEPROJMANAG"/>
+ <column name="MEMBERROLE" value="MEMROLEPROJMANAG"/>
</insert>
<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="OBJECTMEMBERID" value="3bd6db09-063c-43a5-828d-9fe6e958d142"/>
- <column name="ROLE" value="MEMROLEADVISE"/>
+ <column name="MEMBERROLE" value="MEMROLEADVISE"/>
</insert>
<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="OBJECTMEMBERID" value="100e2d29-2d34-4a5d-adc9-c09f9949d136"/>
- <column name="ROLE" value="70cbad1b-eac6-4369-ba50-4946e0fbcb3a"/>
+ <column name="MEMBERROLE" value="70cbad1b-eac6-4369-ba50-4946e0fbcb3a"/>
</insert>
<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="OBJECTMEMBERID" value="094fa52f-28ee-4988-9169-c4fcf0fd58e7"/>
- <column name="ROLE" value="MEMROLEADVISE"/>
+ <column name="MEMBERROLE" value="MEMROLEADVISE"/>
</insert>
<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="OBJECTMEMBERID" value="b91e741e-6e23-4a0a-a3de-06b9be398ed6"/>
- <column name="ROLE" value="MEMROLEEXSALEMANAG"/>
+ <column name="MEMBERROLE" value="MEMROLEEXSALEMANAG"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/init/struct/create_salesproject_member.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_member.xml
index 6a3207693ed51fb19ea25575c29b0328f80942f9..328e0e9e13300bf7b694775ffc32bc364894d6a1 100644
--- a/.liquibase/Data_alias/basic/init/struct/create_salesproject_member.xml
+++ b/.liquibase/Data_alias/basic/init/struct/create_salesproject_member.xml
@@ -12,7 +12,7 @@
<constraints nullable="false"/>
</column>
<column name="RELATIONSHIP" type="INTEGER"/>
- <column name="SALESPROJECT_ROLE" type="CHAR(36)"/>
+ <column name="SALESPROJECT_MEMBERROLE" type="CHAR(36)"/>
</createTable>
</changeSet>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 3a37c54e04ee8b19aebddb712d3d7869d76318ff..a91c9f653bacf8f19dd75ecfd3ea3b5c85d2ee84 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -10642,20 +10642,6 @@
<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>
@@ -10726,6 +10712,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>MEMBERROLE</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>
</entityFields>
</entityDb>
</entities>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index b21777b54c0862efaf779f023ce208029214ed29..49a2f9a4d1e62f44b3eb0eefaed12b2863fe85ab 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -29,10 +29,10 @@
<valueProcess>%aditoprj%/entity/Member_entity/entityfields/objectmemberid/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>ROLE</name>
+ <name>MEMBERROLE</name>
<title>Role</title>
<consumer>KeywordMemberRoles</consumer>
- <displayValueProcess>%aditoprj%/entity/Member_entity/entityfields/role/displayValueProcess.js</displayValueProcess>
+ <displayValueProcess>%aditoprj%/entity/Member_entity/entityfields/memberrole/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ORGANISATION_NAME</name>
@@ -357,13 +357,13 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>ROLE.value</name>
- <recordfield>OBJECTMEMBER.ROLE</recordfield>
- <isFilterable v="true" />
+ <name>MEMBERROLE.displayValue</name>
+ <expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/memberrole.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>ROLE.displayValue</name>
- <expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/role.displayvalue/expression.js</expression>
+ <name>MEMBERROLE.value</name>
+ <recordfield>OBJECTMEMBER.MEMBERROLE</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
diff --git a/entity/Member_entity/entityfields/role/displayValueProcess.js b/entity/Member_entity/entityfields/memberrole/displayValueProcess.js
similarity index 100%
rename from entity/Member_entity/entityfields/role/displayValueProcess.js
rename to entity/Member_entity/entityfields/memberrole/displayValueProcess.js
diff --git a/entity/Member_entity/recordcontainers/db/recordfieldmappings/role.displayvalue/expression.js b/entity/Member_entity/recordcontainers/db/recordfieldmappings/memberrole.displayvalue/expression.js
similarity index 100%
rename from entity/Member_entity/recordcontainers/db/recordfieldmappings/role.displayvalue/expression.js
rename to entity/Member_entity/recordcontainers/db/recordfieldmappings/memberrole.displayvalue/expression.js