From 1e319bd4ee37e87a08a15d9c28abdb323d952406 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 6 Feb 2019 15:36:25 +0100
Subject: [PATCH] renaming: Pers_context -> Contact_context
---
aliasDefinition/Data_alias/Data_alias.aod | 2 +-
.../_____SYSTEM_APPLICATION_NEON.aod | 2 +-
.../entityfields/openeditdefaultsview/onActionProcess.js | 2 +-
.../openeditdefaultsview_action/onActionProcess.js | 2 +-
.../SalesprojectMember_entity/SalesprojectMember_entity.aod | 4 ++--
entity/Task_entity/Task_entity.aod | 4 ++--
entity/Timetracking_entity/Timetracking_entity.aod | 2 +-
.../Pers_context.aod => Contact_context/Contact_context.aod} | 2 +-
neonView/PersFilter_view/PersFilter_view.aod | 2 +-
process/Context_lib/process.js | 2 +-
process/Relation_lib/process.js | 2 +-
11 files changed, 13 insertions(+), 13 deletions(-)
rename neonContext/{Pers_context/Pers_context.aod => Contact_context/Contact_context.aod} (98%)
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 98e773860a..1fcaef75b7 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -5957,7 +5957,7 @@
<descriptionColumn>DESCCOLUMN</descriptionColumn>
<query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js</query>
<subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js</subQueries>
- <resultContextNeon>Pers_context</resultContextNeon>
+ <resultContextNeon>Contact_context</resultContextNeon>
<affectedTables>
<element>ADDRESS</element>
<element>COMM</element>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 520211cda6..9334e5af6e 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -6,7 +6,7 @@
<node name="CONTACTS" kind="123" title="Contactmanagement">
<icon>VAADIN:STAR</icon>
<node name="Group1" kind="123" title="">
- <node name="Pers_context" kind="10077" />
+ <node name="Contact_context" kind="10077" />
<node name="Org_context" kind="10077" />
<node name="Activity_context" kind="10077" />
<node name="Task_context" kind="10077" />
diff --git a/entity/Contact_entity/entityfields/openeditdefaultsview/onActionProcess.js b/entity/Contact_entity/entityfields/openeditdefaultsview/onActionProcess.js
index 637f5c51eb..bdf21bff22 100644
--- a/entity/Contact_entity/entityfields/openeditdefaultsview/onActionProcess.js
+++ b/entity/Contact_entity/entityfields/openeditdefaultsview/onActionProcess.js
@@ -1,3 +1,3 @@
import("system.vars");
import("system.neon");
-neon.openContext("Pers_context", "PersEditDefaults_view", [vars.get("$field.RELATIONID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
+neon.openContext("Contact_context", "PersEditDefaults_view", [vars.get("$field.RELATIONID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js b/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
index 5b79095577..13db55b253 100644
--- a/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
+++ b/entity/Contact_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
@@ -1,3 +1,3 @@
import("system.vars");
import("system.neon");
-neon.openContext("Pers_context", "PersEditDefaults_view", [vars.get("$sys.uid")], neon.OPERATINGSTATE_EDIT, null);
+neon.openContext("Contact_context", "PersEditDefaults_view", [vars.get("$sys.uid")], neon.OPERATINGSTATE_EDIT, null);
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 69802846f9..7b4b09176b 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -23,7 +23,7 @@
<name>RELATION_ID</name>
<title>Person</title>
<consumer>PersLookup_dfo</consumer>
- <linkedContext>Pers_context</linkedContext>
+ <linkedContext>Contact_context</linkedContext>
</entityField>
<entityField>
<name>SALESPROJECT_ID</name>
@@ -118,7 +118,7 @@
<name>PERS_FULL_NAME</name>
<title>Name</title>
<consumer>PersSalesprojectMember_dfo</consumer>
- <linkedContext>Pers_context</linkedContext>
+ <linkedContext>Contact_context</linkedContext>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/pers_full_name/valueProcess.js</valueProcess>
</entityField>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 54d1d60df1..99697c470a 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -47,14 +47,14 @@
<name>REQUESTOR_RELATION_ID</name>
<title>{$TASK_REQUESTOR}</title>
<consumer>PersRequestor_dfo</consumer>
- <linkedContext>Pers_context</linkedContext>
+ <linkedContext>Contact_context</linkedContext>
<mandatory v="true" />
</entityField>
<entityField>
<name>EDITOR_RELATION_ID</name>
<title>{$TASK_EDITOR}</title>
<consumer>PersEditor_dfo</consumer>
- <linkedContext>Pers_context</linkedContext>
+ <linkedContext>Contact_context</linkedContext>
</entityField>
<entityField>
<name>START_DATE</name>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 0daec3e216..55fe3c6efc 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -42,7 +42,7 @@
<name>RELATION_ID</name>
<title>Creator</title>
<consumer>TimetrackingPers_dfo</consumer>
- <linkedContext>Pers_context</linkedContext>
+ <linkedContext>Contact_context</linkedContext>
<mandatory v="true" />
</entityField>
<entityField>
diff --git a/neonContext/Pers_context/Pers_context.aod b/neonContext/Contact_context/Contact_context.aod
similarity index 98%
rename from neonContext/Pers_context/Pers_context.aod
rename to neonContext/Contact_context/Contact_context.aod
index 5a53cd234c..897040a7ae 100644
--- a/neonContext/Pers_context/Pers_context.aod
+++ b/neonContext/Contact_context/Contact_context.aod
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
- <name>Pers_context</name>
+ <name>Contact_context</name>
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<mainview>PersMain_view</mainview>
diff --git a/neonView/PersFilter_view/PersFilter_view.aod b/neonView/PersFilter_view/PersFilter_view.aod
index 78fa4cbc7a..dc771b721c 100644
--- a/neonView/PersFilter_view/PersFilter_view.aod
+++ b/neonView/PersFilter_view/PersFilter_view.aod
@@ -8,7 +8,7 @@
<name>AllContactsDashlet</name>
<title>Contacts</title>
<description>Show all contacts</description>
- <fragment>Pers_context/filter</fragment>
+ <fragment>Contact_context/filter</fragment>
<singleton v="true" />
<requiresConfiguration v="false" />
<icon>vaadin:users</icon>
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 34ae91ccc4..1baea5a1e7 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -52,7 +52,7 @@ ContextUtils.getNameSubselectSql = function(pContextIdDbField, pRowIdDbField)
var maskingUtils = new SqlMaskingUtils();
select += "when 'Org_context' then (select \"NAME\" from ORG where ORG.ORGID = " + pRowIdDbField + ") ";
- select += "when 'Pers_context' then (select " + maskingUtils.concat(["FIRSTNAME", "LASTNAME"]) + " from PERS where PERS.PERSID = " + pRowIdDbField + ") ";
+ select += "when 'Contact_context' then (select " + maskingUtils.concat(["FIRSTNAME", "LASTNAME"]) + " from PERS where PERS.PERSID = " + pRowIdDbField + ") ";
select += "when 'Activity_context' then (select SUBJECT from ACTIVITY where ACTIVITY.ACTIVITYID = " + pRowIdDbField + ") ";
select += "when 'Salesproject_context' then (select " + maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]) + " from SALESPROJECT where SALESPROJECT.SALESPROJECTID = " + pRowIdDbField + ") ";
// TODO: keywords sind noch nicht in der DB somit gibt es nichts ähnliches zu getKeySQL.
diff --git a/process/Relation_lib/process.js b/process/Relation_lib/process.js
index e3dac3e936..c66c485dff 100644
--- a/process/Relation_lib/process.js
+++ b/process/Relation_lib/process.js
@@ -146,7 +146,7 @@ RelationUtils.getContextByPersOrg = function(pPersId, pOrgId)
return ContextUtils.getContextName("Org_context");
case 2: // private Pers
case 3: // Pers
- return ContextUtils.getContextName("Pers_context");
+ return ContextUtils.getContextName("Contact_context");
default:
return "";
}
--
GitLab