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

renaming: Pers_context -> Contact_context

parent 51b1440c
No related branches found
No related tags found
No related merge requests found
Showing with 13 additions and 13 deletions
...@@ -5957,7 +5957,7 @@ ...@@ -5957,7 +5957,7 @@
<descriptionColumn>DESCCOLUMN</descriptionColumn> <descriptionColumn>DESCCOLUMN</descriptionColumn>
<query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js</query> <query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js</query>
<subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js</subQueries> <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js</subQueries>
<resultContextNeon>Pers_context</resultContextNeon> <resultContextNeon>Contact_context</resultContextNeon>
<affectedTables> <affectedTables>
<element>ADDRESS</element> <element>ADDRESS</element>
<element>COMM</element> <element>COMM</element>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<node name="CONTACTS" kind="123" title="Contactmanagement"> <node name="CONTACTS" kind="123" title="Contactmanagement">
<icon>VAADIN:STAR</icon> <icon>VAADIN:STAR</icon>
<node name="Group1" kind="123" title=""> <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="Org_context" kind="10077" />
<node name="Activity_context" kind="10077" /> <node name="Activity_context" kind="10077" />
<node name="Task_context" kind="10077" /> <node name="Task_context" kind="10077" />
......
import("system.vars"); import("system.vars");
import("system.neon"); import("system.neon");
neon.openContext("Pers_context", "PersEditDefaults_view", [vars.get("$field.RELATIONID")], neon.OPERATINGSTATE_EDIT, null); neon.openContext("Contact_context", "PersEditDefaults_view", [vars.get("$field.RELATIONID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file \ No newline at end of file
import("system.vars"); import("system.vars");
import("system.neon"); 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);
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<name>RELATION_ID</name> <name>RELATION_ID</name>
<title>Person</title> <title>Person</title>
<consumer>PersLookup_dfo</consumer> <consumer>PersLookup_dfo</consumer>
<linkedContext>Pers_context</linkedContext> <linkedContext>Contact_context</linkedContext>
</entityField> </entityField>
<entityField> <entityField>
<name>SALESPROJECT_ID</name> <name>SALESPROJECT_ID</name>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<name>PERS_FULL_NAME</name> <name>PERS_FULL_NAME</name>
<title>Name</title> <title>Name</title>
<consumer>PersSalesprojectMember_dfo</consumer> <consumer>PersSalesprojectMember_dfo</consumer>
<linkedContext>Pers_context</linkedContext> <linkedContext>Contact_context</linkedContext>
<state>READONLY</state> <state>READONLY</state>
<valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/pers_full_name/valueProcess.js</valueProcess> <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/pers_full_name/valueProcess.js</valueProcess>
</entityField> </entityField>
......
...@@ -47,14 +47,14 @@ ...@@ -47,14 +47,14 @@
<name>REQUESTOR_RELATION_ID</name> <name>REQUESTOR_RELATION_ID</name>
<title>{$TASK_REQUESTOR}</title> <title>{$TASK_REQUESTOR}</title>
<consumer>PersRequestor_dfo</consumer> <consumer>PersRequestor_dfo</consumer>
<linkedContext>Pers_context</linkedContext> <linkedContext>Contact_context</linkedContext>
<mandatory v="true" /> <mandatory v="true" />
</entityField> </entityField>
<entityField> <entityField>
<name>EDITOR_RELATION_ID</name> <name>EDITOR_RELATION_ID</name>
<title>{$TASK_EDITOR}</title> <title>{$TASK_EDITOR}</title>
<consumer>PersEditor_dfo</consumer> <consumer>PersEditor_dfo</consumer>
<linkedContext>Pers_context</linkedContext> <linkedContext>Contact_context</linkedContext>
</entityField> </entityField>
<entityField> <entityField>
<name>START_DATE</name> <name>START_DATE</name>
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<name>RELATION_ID</name> <name>RELATION_ID</name>
<title>Creator</title> <title>Creator</title>
<consumer>TimetrackingPers_dfo</consumer> <consumer>TimetrackingPers_dfo</consumer>
<linkedContext>Pers_context</linkedContext> <linkedContext>Contact_context</linkedContext>
<mandatory v="true" /> <mandatory v="true" />
</entityField> </entityField>
<entityField> <entityField>
......
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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> <title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
<mainview>PersMain_view</mainview> <mainview>PersMain_view</mainview>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<name>AllContactsDashlet</name> <name>AllContactsDashlet</name>
<title>Contacts</title> <title>Contacts</title>
<description>Show all contacts</description> <description>Show all contacts</description>
<fragment>Pers_context/filter</fragment> <fragment>Contact_context/filter</fragment>
<singleton v="true" /> <singleton v="true" />
<requiresConfiguration v="false" /> <requiresConfiguration v="false" />
<icon>vaadin:users</icon> <icon>vaadin:users</icon>
......
...@@ -52,7 +52,7 @@ ContextUtils.getNameSubselectSql = function(pContextIdDbField, pRowIdDbField) ...@@ -52,7 +52,7 @@ ContextUtils.getNameSubselectSql = function(pContextIdDbField, pRowIdDbField)
var maskingUtils = new SqlMaskingUtils(); var maskingUtils = new SqlMaskingUtils();
select += "when 'Org_context' then (select \"NAME\" from ORG where ORG.ORGID = " + pRowIdDbField + ") "; 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 '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 + ") "; 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. // TODO: keywords sind noch nicht in der DB somit gibt es nichts ähnliches zu getKeySQL.
......
...@@ -146,7 +146,7 @@ RelationUtils.getContextByPersOrg = function(pPersId, pOrgId) ...@@ -146,7 +146,7 @@ RelationUtils.getContextByPersOrg = function(pPersId, pOrgId)
return ContextUtils.getContextName("Org_context"); return ContextUtils.getContextName("Org_context");
case 2: // private Pers case 2: // private Pers
case 3: // Pers case 3: // Pers
return ContextUtils.getContextName("Pers_context"); return ContextUtils.getContextName("Contact_context");
default: default:
return ""; return "";
} }
......
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