Skip to content
Snippets Groups Projects
Commit c7bf4dd0 authored by Dominik Lechner's avatar Dominik Lechner
Browse files

Merge branch 'master' into campaignmanagement 

# Conflicts:
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
parents cafda049 aece9d36
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 79 deletions
entity/Contact_entity/Contact_entity.aod
+ 1
− 8
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>Contact_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
......@@ -58,7 +58,6 @@
</entityField>
<entityConsumer>
<name>Organisations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
......@@ -78,7 +77,6 @@
</entityParameter>
<entityProvider>
<name>PersonRelated</name>
<fieldType>DEPENDENCY_IN</fieldType>
<children>
<entityParameter>
<name>OwnContactId_param</name>
......@@ -99,7 +97,6 @@
</entityField>
<entityConsumer>
<name>Communications</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Communication_entity</entityName>
......@@ -114,7 +111,6 @@
</entityConsumer>
<entityConsumer>
<name>ContactAddresses</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Address_entity</entityName>
......@@ -137,7 +133,6 @@
</entityField>
<entityConsumer>
<name>Languages</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Language_entity</entityName>
......@@ -146,7 +141,6 @@
</entityConsumer>
<entityProvider>
<name>PersonsContactsExceptOwn</name>
<fieldType>DEPENDENCY_IN</fieldType>
<targetContextField>targetContext</targetContextField>
<targetIdField>CONTACTID</targetIdField>
<titlePlural>Other Contactroles</titlePlural>
......@@ -184,7 +178,6 @@
</entityField>
<entityConsumer>
<name>KeywordContactStates</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
......
entity/Context_entity/Context_entity.aod
+ 1
− 4
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>Context_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation>
......@@ -34,7 +34,6 @@
</entityField>
<entityProvider>
<name>Context</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>dab09827-2eeb-403d-a070-ba805d2640ee</name>
......@@ -57,7 +56,6 @@
</entityParameter>
<entityProvider>
<name>ActivityLinkable</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>de50f67e-5ed0-46aa-b007-8c086cf5fea5</name>
......@@ -76,7 +74,6 @@
</entityProvider>
<entityProvider>
<name>TaskLinkable</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>ff8925da-b69a-46dd-8fe2-d6707da8808e</name>
......
entity/Contract_entity/Contract_entity.aod
+ 1
− 15
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>Contract_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contract_entity/documentation.adoc</documentation>
......@@ -92,7 +92,6 @@
</entityField>
<entityProvider>
<name>Contracts</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
......@@ -138,7 +137,6 @@
</entityFieldGroup>
<entityConsumer>
<name>Activities</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Activity_entity</entityName>
......@@ -161,7 +159,6 @@
</entityConsumer>
<entityConsumer>
<name>AnyContacts</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>AnyContact_entity</entityName>
......@@ -190,7 +187,6 @@
</entityField>
<entityConsumer>
<name>Documents</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
......@@ -215,7 +211,6 @@
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<stateProcess>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
......@@ -238,7 +233,6 @@
</entityConsumer>
<entityConsumer>
<name>ContractPayments</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
......@@ -254,7 +248,6 @@
</entityConsumer>
<entityConsumer>
<name>ContractStates</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
......@@ -270,7 +263,6 @@
</entityConsumer>
<entityConsumer>
<name>ContractTypes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
......@@ -286,7 +278,6 @@
</entityConsumer>
<entityActionField>
<name>newActivity</name>
<fieldType>ACTION</fieldType>
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
......@@ -295,7 +286,6 @@
</entityActionField>
<entityConsumer>
<name>Attributes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<onValidation>%aditoprj%/entity/Contract_entity/entityfields/attributes/onValidation.js</onValidation>
<dependency>
<name>dependency</name>
......@@ -319,7 +309,6 @@
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
......@@ -340,7 +329,6 @@
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<stateProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
......@@ -364,14 +352,12 @@
</entityConsumer>
<entityActionField>
<name>newTask</name>
<fieldType>ACTION</fieldType>
<title>New task</title>
<onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
<iconId>VAADIN:TASKS</iconId>
</entityActionField>
<entityConsumer>
<name>LogHistoryConsumer</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>LogHistory_entity</entityName>
......
entity/Contract_entity/entityfields/attributes/onValidation.js
+ 1
− 1
View file @ c7bf4dd0
......@@ -3,4 +3,4 @@ import("system.vars");
import("Attribute_lib");
import("system.result");
result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), "Attributes"));
\ No newline at end of file
entity/Countries_Entity/Countries_Entity.aod
+ 1
− 2
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>Countries_Entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Countries_Entity/documentation.adoc</documentation>
......@@ -14,7 +14,6 @@
</entityProvider>
<entityProvider>
<name>ISO2Name</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>83e8a2e6-aa80-4b35-a0ad-8dad483ed428</name>
......
entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+ 1
− 4
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>DocumentTemplateLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Attachment</title>
......@@ -51,7 +51,6 @@
</entityParameter>
<entityConsumer>
<name>Attachments</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplate_entity</entityName>
......@@ -67,7 +66,6 @@
</entityConsumer>
<entityProvider>
<name>Links</name>
<fieldType>DEPENDENCY_IN</fieldType>
<targetIdField>DOCUMENTTEMPLATE_ID_CHILD</targetIdField>
<recordContainer>db</recordContainer>
<dependencies>
......@@ -99,7 +97,6 @@
</entityParameter>
<entityActionField>
<name>OpenDocument</name>
<fieldType>ACTION</fieldType>
<onActionProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js</onActionProcess>
<iconId>VAADIN:DOWNLOAD</iconId>
</entityActionField>
......
entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
+ 1
− 2
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>DocumentTemplateTypeCategory_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js</contentTitleProcess>
......@@ -25,7 +25,6 @@
</entityField>
<entityProvider>
<name>ByCategory</name>
<fieldType>DEPENDENCY_IN</fieldType>
<lookupIdfield>KEYID</lookupIdfield>
<dependencies>
<entityDependency>
......
entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+ 1
− 9
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>DocumentTemplate_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:FILE_FONT</icon>
......@@ -78,7 +78,6 @@
</entityField>
<entityConsumer>
<name>Documents</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
......@@ -97,7 +96,6 @@
</entityConsumer>
<entityConsumer>
<name>Languages</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Language_entity</entityName>
......@@ -106,7 +104,6 @@
</entityConsumer>
<entityConsumer>
<name>KeywordDocumentTemplateType</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
......@@ -121,7 +118,6 @@
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<onValidation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/onValidation.js</onValidation>
<dependency>
<name>dependency</name>
......@@ -167,7 +163,6 @@
</entityField>
<entityConsumer>
<name>DocumentTemplateTypeCategory</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplateTypeCategory_entity</entityName>
......@@ -183,7 +178,6 @@
</entityConsumer>
<entityProvider>
<name>Attachments</name>
<fieldType>DEPENDENCY_IN</fieldType>
<targetContextField>TARGET_CONTEXT</targetContextField>
<targetIdField>DOCUMENTTEMPLATEID</targetIdField>
<targetConsumerProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attachments/targetConsumerProcess.js</targetConsumerProcess>
......@@ -200,7 +194,6 @@
</entityProvider>
<entityConsumer>
<name>Links</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
......@@ -229,7 +222,6 @@
</entityParameter>
<entityProvider>
<name>DocumentTemplateProvider</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>e1c555c3-9e53-4ccf-962c-4bdd3c14bb16</name>
......
entity/DocumentTemplate_entity/entityfields/attributes/onValidation.js
+ 1
− 1
View file @ c7bf4dd0
......@@ -3,4 +3,4 @@ import("system.vars");
import("Attribute_lib");
import("system.result");
result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), "Attributes"));
\ No newline at end of file
entity/Document_entity/Document_entity.aod
+ 1
− 5
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>Document_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Document</title>
......@@ -67,7 +67,6 @@
<children>
<entityActionField>
<name>downloadFilesAction</name>
<fieldType>ACTION</fieldType>
<onActionProcess>%aditoprj%/entity/Document_entity/entityfields/document_actions/children/downloadfilesaction/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<isSelectionAction v="true" />
......@@ -131,13 +130,11 @@
</entityParameter>
<entityActionField>
<name>downloadSingleFileAction</name>
<fieldType>ACTION</fieldType>
<onActionProcess>%aditoprj%/entity/Document_entity/entityfields/downloadsinglefileaction/onActionProcess.js</onActionProcess>
<iconId>VAADIN:DOWNLOAD</iconId>
</entityActionField>
<entityProvider>
<name>Documents</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>jdito</recordContainer>
<dependencies>
<entityDependency>
......@@ -224,7 +221,6 @@
</entityProvider>
<entityProvider>
<name>MainDocuments</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>jdito</recordContainer>
<dependencies>
<entityDependency>
......
entity/Email_entity/Email_entity.aod
+ 1
− 3
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>Email_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
......@@ -18,7 +18,6 @@
</entityField>
<entityConsumer>
<name>DocumnetTemplates</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplate_entity</entityName>
......@@ -39,7 +38,6 @@
</entityField>
<entityConsumer>
<name>EmailAddresses</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Communication_entity</entityName>
......
entity/EmployeeRole_entity/EmployeeRole_entity.aod
+ 1
− 2
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>EmployeeRole_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Role</title>
......@@ -20,7 +20,6 @@
</entityParameter>
<entityProvider>
<name>EmployeeRoles</name>
<fieldType>DEPENDENCY_IN</fieldType>
<dependencies>
<entityDependency>
<name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
......
entity/Employee_entity/Employee_entity.aod
+ 2
− 9
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>Employee_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Employee</title>
......@@ -79,7 +79,6 @@
</entityField>
<entityActionField>
<name>setPassword</name>
<fieldType>ACTION</fieldType>
<title>Set password</title>
<onActionProcess>%aditoprj%/entity/Employee_entity/entityfields/setpassword/onActionProcess.js</onActionProcess>
<iconId>VAADIN:PASSWORD</iconId>
......@@ -97,7 +96,6 @@
</entityParameter>
<entityConsumer>
<name>Contacts</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Person_entity</entityName>
......@@ -106,7 +104,6 @@
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<onValidation>%aditoprj%/entity/Employee_entity/entityfields/attributes/onValidation.js</onValidation>
<dependency>
<name>dependency</name>
......@@ -158,10 +155,10 @@
</entityField>
<entityField>
<name>ROLES</name>
<searchable v="false" />
</entityField>
<entityConsumer>
<name>EmployeeRoles</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>EmployeeRole_entity</entityName>
......@@ -176,7 +173,6 @@
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
......@@ -195,7 +191,6 @@
</entityConsumer>
<entityConsumer>
<name>Documents</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
......@@ -217,7 +212,6 @@
</entityConsumer>
<entityProvider>
<name>Employees</name>
<fieldType>DEPENDENCY_IN</fieldType>
<lookupIdfield>CONTACT_ID</lookupIdfield>
<dependencies>
<entityDependency>
......@@ -254,7 +248,6 @@
</entityProvider>
<entityConsumer>
<name>Departments</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Attribute_entity</entityName>
......
entity/Employee_entity/entityfields/attributes/onValidation.js
+ 1
− 1
View file @ c7bf4dd0
......@@ -5,4 +5,4 @@ import("Attribute_lib");
import("system.result");
result.string(AttributeRelationUtils.validateAttributeCount(EmployeeUtils.sliceUserId(vars.get("$field.UID")),
ContextUtils.getCurrentContextId(), vars.get("$field.Attributes.insertedRows")));
\ No newline at end of file
ContextUtils.getCurrentContextId(), "Attributes"));
\ No newline at end of file
entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+ 2
− 1
View file @ c7bf4dd0
import("system.logging");
import("Attribute_lib");
import("system.vars");
import("system.result");
......@@ -41,6 +42,6 @@ var filter = vars.exists("$local.userfilter") && vars.get("$local.userfilter");
users = JditoFilterUtils.filterRecords(["UID", "TITLE", "ISACTIVE", "FIRSTNAME", "LASTNAME", "EMAIL_ADDRESS", "", "DESCRIPTION", "CONTACT_ID", "", "DEPARTMENT"], users, filter);
ArrayUtils.sort2d(users, 0, true, false); //sort by username
ArrayUtils.sort2d(users, 1, true, false); //sort by login (not username)
result.object(users);
entity/Gender_keyword/Gender_keyword.aod
+ 1
− 1
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>Gender_keyword</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/Gender_keyword/contentTitleProcess.js</contentTitleProcess>
......
entity/IndexSearchEntity/IndexSearchEntity.aod
+ 1
− 1
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>IndexSearchEntity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entityFields>
......
entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+ 1
− 3
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>KeywordAttributeRelation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/documentation.adoc</documentation>
......@@ -41,7 +41,6 @@
</entityField>
<entityProvider>
<name>AttributesForKeywordEntry</name>
<fieldType>DEPENDENCY_IN</fieldType>
<titlePlural></titlePlural>
<recordContainer>db</recordContainer>
<dependencies>
......@@ -76,7 +75,6 @@
</entityParameter>
<entityConsumer>
<name>KeywordAttributes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>KeywordAttribute_entity</entityName>
......
entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+ 1
− 3
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>KeywordAttribute_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordAttribute_entity/documentation.adoc</documentation>
......@@ -39,7 +39,6 @@
</entityField>
<entityProvider>
<name>SpecificContainerKeyword</name>
<fieldType>DEPENDENCY_IN</fieldType>
<documentation>%aditoprj%/entity/KeywordAttribute_entity/entityfields/specificcontainerkeyword/documentation.adoc</documentation>
<dependencies>
<entityDependency>
......@@ -74,7 +73,6 @@
</entityParameter>
<entityConsumer>
<name>KeywordAttributeTypes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
......
entity/KeywordEntry_entity/KeywordEntry_entity.aod
+ 1
− 4
View file @ c7bf4dd0
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.6">
<name>KeywordEntry_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordEntry_entity/documentation.adoc</documentation>
......@@ -76,7 +76,6 @@
</entityParameter>
<entityProvider>
<name>SpecificContainerKeywords</name>
<fieldType>DEPENDENCY_IN</fieldType>
<lookupIdfield>KEYID</lookupIdfield>
<recordContainer>db</recordContainer>
<dependencies>
......@@ -425,7 +424,6 @@
</entityParameter>
<entityConsumer>
<name>KeywordAttributeRelations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>KeywordAttributeRelation_entity</entityName>
......@@ -441,7 +439,6 @@
</entityConsumer>
<entityConsumer>
<name>KeywordAttributeRelationsReadOnly</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/documentation.adoc</documentation>
<state>READONLY</state>
<dependency>
......
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