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

renaming 

    :Org_context -> Organisation_context
    :Org_context-views -> Organisation_context-views
    :Comm_context -> Communication_context
    :Comm_context-views -> Communication_context-views
parent fb95f72e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 40 additions and 40 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 1
− 1
View file @ caead4cb
......@@ -5939,7 +5939,7 @@
<descriptionColumn>DESCCOLUMN</descriptionColumn>
<query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/query.js</query>
<subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js</subQueries>
<resultContextNeon>Org_context</resultContextNeon>
<resultContextNeon>Organisation_context</resultContextNeon>
<affectedTables>
<element>ADDRESS</element>
<element>COMM</element>
......
application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+ 1
− 1
View file @ caead4cb
......@@ -7,7 +7,7 @@
<icon>VAADIN:STAR</icon>
<node name="Group1" kind="123" title="">
<node name="Contact_context" kind="10077" />
<node name="Org_context" kind="10077" />
<node name="Organisation_context" kind="10077" />
<node name="Activity_context" kind="10077" />
<node name="Task_context" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
......
entity/AttributeUsage_entity/entityfields/object_type/possibleItemsProcess.js
+ 4
− 4
View file @ caead4cb
import("system.result");
//TODO: when available, use a function to get the possible contexts
result.object([["Org_context", "Org"]]);
\ No newline at end of file
import("system.result");
//TODO: when available, use a function to get the possible contexts
result.object([["Organisation_context", "Org"]]);
\ No newline at end of file
entity/Contact_entity/entityfields/org_id/linkedContextProcess.js
+ 1
− 1
View file @ caead4cb
......@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
if(vars.getString("$field.ORG_ID") != 0)
result.string("Org_context");
\ No newline at end of file
result.string("Organisation_context");
\ No newline at end of file
entity/Organisation_entity/entityfields/openeditdefaultsview/onActionProcess.js
+ 1
− 1
View file @ caead4cb
import("system.vars");
import("system.neon");
neon.openContext("Org_context", "OrgEditDefaults_view", [vars.get("$field.ORGID")], neon.OPERATINGSTATE_EDIT, null);
neon.openContext("Organisation_context", "OrganisationEditDefaults_view", [vars.get("$field.ORGID")], neon.OPERATINGSTATE_EDIT, null);
entity/Product_entity/entityfields/relation_id/linkedContextProcess.js
+ 1
− 1
View file @ caead4cb
......@@ -3,4 +3,4 @@ import("system.result");
import("Relation_lib");
if(vars.get("$field.RELATION_ID"))
result.string("Org_context");
\ No newline at end of file
result.string("Organisation_context");
\ No newline at end of file
entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+ 1
− 1
View file @ caead4cb
......@@ -78,7 +78,7 @@
<name>RELATION_ID</name>
<title>Organisation</title>
<consumer>CompetitionOrg_lookup_dfo</consumer>
<linkedContext>Org_context</linkedContext>
<linkedContext>Organisation_context</linkedContext>
</entityField>
<entityField>
<name>ORG_NAME</name>
......
entity/Salesproject_entity/Salesproject_entity.aod
+ 1
− 1
View file @ caead4cb
......@@ -81,7 +81,7 @@
<name>RELATION_ID</name>
<title>Company</title>
<consumer>Organisations</consumer>
<linkedContext>Org_context</linkedContext>
<linkedContext>Organisation_context</linkedContext>
<mandatory v="true" />
</entityField>
<entityField>
......
neonContext/Comm_context/Comm_context.aod → neonContext/Communication_context/Communication_context.aod
+ 5
− 5
View file @ caead4cb
<?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>Comm_context</name>
<name>Communication_context</name>
<title>Communication</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entity>Communication_entity</entity>
<references>
<neonViewReference>
<name>a6ea1a77-09d3-4c36-90dc-3bcb4a22842a</name>
<view>CommMultiEdit_view</view>
<view>CommunicationMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>af0e1f4b-a859-4302-b8d8-05568b9a4655</name>
<view>CommList_view</view>
<view>CommunicationList_view</view>
</neonViewReference>
<neonViewReference>
<name>9bccd737-1feb-48e3-9b77-9b6b4720a4f8</name>
<view>CommEdit_view</view>
<view>CommunicationEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>ba995694-e88f-4f50-b4e7-5018b034747f</name>
<view>CommFilter_view</view>
<view>CommunicationFilter_view</view>
</neonViewReference>
</references>
</neonContext>
neonContext/Org_context/Org_context.aod → neonContext/Organisation_context/Organisation_context.aod
+ 13
− 13
View file @ caead4cb
<?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>Org_context</name>
<name>Organisation_context</name>
<title>Company</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:BUILDING</icon>
<mainview>OrgMain_view</mainview>
<filterview>OrgFilter_view</filterview>
<editview>OrgEdit_view</editview>
<preview>OrgPreview_view</preview>
<lookupview>OrgLookup_view</lookupview>
<mainview>OrganisationMain_view</mainview>
<filterview>OrganisationFilter_view</filterview>
<editview>OrganisationEdit_view</editview>
<preview>OrganisationPreview_view</preview>
<lookupview>OrganisationLookup_view</lookupview>
<entity>Organisation_entity</entity>
<references>
<neonViewReference>
<name>c71a570c-2408-474d-961a-7409d0999fde</name>
<view>OrgFilter_view</view>
<view>OrganisationFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>167b9623-4050-480a-811c-9824549d3834</name>
<view>OrgPreview_view</view>
<view>OrganisationPreview_view</view>
</neonViewReference>
<neonViewReference>
<name>42b328d7-e3f2-4bab-bca8-6899d89df78d</name>
<view>OrgMain_view</view>
<view>OrganisationMain_view</view>
</neonViewReference>
<neonViewReference>
<name>68c233a5-ac5a-4aa7-b795-cd5aeb7af2e6</name>
<view>OrgEdit_view</view>
<view>OrganisationEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>bb592f88-fa9f-4ecc-98cc-51a7903dc970</name>
<view>OrgAttr_view</view>
<view>OrganisationAttr_view</view>
</neonViewReference>
<neonViewReference>
<name>b1634a51-b3f3-47b7-aea0-b9e8fba851da</name>
<view>OrgEditDefaults_view</view>
<view>OrganisationEditDefaults_view</view>
</neonViewReference>
<neonViewReference>
<name>27c1cd03-506a-4e1e-a080-79b9dca6eefd</name>
<view>OrgLookup_view</view>
<view>OrganisationLookup_view</view>
</neonViewReference>
</references>
</neonContext>
neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
+ 1
− 1
View file @ caead4cb
......@@ -48,7 +48,7 @@
</neonDashlet>
<neonDashlet>
<name>Dashlet4</name>
<viewName>OrgFilter_view</viewName>
<viewName>OrganisationFilter_view</viewName>
<configName>AllOrgsDashlet</configName>
<uiConfiguration>
<name>uiConfiguration</name>
......
neonView/CommEdit_view/CommEdit_view.aod → neonView/CommunicationEdit_view/CommunicationEdit_view.aod
+ 1
− 1
View file @ caead4cb
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>CommEdit_view</name>
<name>CommunicationEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
......
neonView/CommFilter_view/CommFilter_view.aod → neonView/CommunicationFilter_view/CommunicationFilter_view.aod
+ 1
− 1
View file @ caead4cb
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>CommFilter_view</name>
<name>CommunicationFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
......
neonView/CommList_view/CommList_view.aod → neonView/CommunicationList_view/CommunicationList_view.aod
+ 1
− 1
View file @ caead4cb
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>CommList_view</name>
<name>CommunicationList_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<noneLayout>
......
neonView/CommMultiEdit_view/CommMultiEdit_view.aod → neonView/CommunicationMultiEdit_view/CommunicationMultiEdit_view.aod
+ 1
− 1
View file @ caead4cb
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>CommMultiEdit_view</name>
<name>CommunicationMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<noneLayout>
......
neonView/ContactEdit_view/ContactEdit_view.aod
+ 1
− 1
View file @ caead4cb
......@@ -68,7 +68,7 @@
<neonViewReference>
<name>fc64789f-b4c6-401e-86e3-f484451c7689</name>
<entityField>Communications</entityField>
<view>CommMultiEdit_view</view>
<view>CommunicationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
neonView/ContactPreview_view/ContactPreview_view.aod
+ 1
− 1
View file @ caead4cb
......@@ -18,7 +18,7 @@
<neonViewReference>
<name>5a1b7683-2fec-4763-9b45-e4c7a18d70fd</name>
<entityField>Communications</entityField>
<view>CommList_view</view>
<view>CommunicationList_view</view>
</neonViewReference>
<neonViewReference>
<name>4c4b1e66-fdc2-469c-a553-244b6dbffbe0</name>
......
neonView/OrgEditDefaults_view/OrgEditDefaults_view.aod
+ 1
− 1
View file @ caead4cb
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>OrgEditDefaults_view</name>
<name>OrganisationEditDefaults_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
......
neonView/OrgAttr_view/OrgAttr_view.aod → neonView/OrganisationAttr_view/OrganisationAttr_view.aod
+ 1
− 1
View file @ caead4cb
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>OrgAttr_view</name>
<name>OrganisationAttr_view</name>
<description>TODO: View verknüpfung von generics momentan nicht möglich! Desshalb habe ich die Felder nochmal direkt verknüpft, damit es zumindest nutzbar ist.
TODO: diese Felder werden später als Attribute implementiert</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
......
neonView/OrgEdit_view/OrgEdit_view.aod → neonView/OrganisationEdit_view/OrganisationEdit_view.aod
+ 2
− 2
View file @ caead4cb
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>OrgEdit_view</name>
<name>OrganisationEdit_view</name>
<title>Company</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:BUILDING</icon>
......@@ -50,7 +50,7 @@
<neonViewReference>
<name>6355808f-ee94-4caf-95b1-3848e81c75b7</name>
<entityField>Communications</entityField>
<view>CommMultiEdit_view</view>
<view>CommunicationMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
<name>2e648487-73d1-41ce-a562-5ce6bce3b599</name>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment