Skip to content
Snippets Groups Projects
Commit 993fdf62 authored by Benjamin Ulrich's avatar Benjamin Ulrich :speech_balloon:
Browse files

merged origin/2020.2 into 1061035_FixBulkmailThrowError

parents 85157793 d676a03a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 125 additions and 15 deletions
entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
+ 0
− 1
View file @ 993fdf62
......@@ -52,7 +52,6 @@
</entityParameter>
<entityParameter>
<name>ReportType_param</name>
<valueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/reporttype_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
<entityProvider>
......
entity/DSGVO_entity/DSGVO_entity.aod
+ 0
− 1
View file @ 993fdf62
......@@ -13,7 +13,6 @@
</siblings>
<grantCreate v="false" />
<grantDelete v="false" />
<afterSave>%aditoprj%/entity/DSGVO_entity/afterSave.js</afterSave>
<titlePlural></titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
......
entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+ 1
− 0
View file @ 993fdf62
......@@ -148,6 +148,7 @@
</entityConsumer>
<entityField>
<name>departmentAttributeName</name>
<documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/departmentattributename/documentation.adoc</documentation>
<title>Department</title>
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/departmentattributename/stateProcess.js</stateProcess>
......
entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
+ 4
− 0
View file @ 993fdf62
......@@ -43,6 +43,10 @@
<name>Blacklist_param</name>
<valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>GetAllContexts_param</name>
<valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/getallcontexts_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityProvider>
......
entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js
+ 1
− 1
View file @ 993fdf62
import("system.result");
result.object(["Person", "Organisation", "Offer"]);
\ No newline at end of file
result.object(["Person", "Organisation", "Offer", "MarketingWorkflowLauncher"]);
\ No newline at end of file
entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/getallcontexts_param/valueProcess.js 0 → 100644
+ 3
− 0
View file @ 993fdf62
import("system.result");
result.string(true);
\ No newline at end of file
entity/DocumentTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
+ 3
− 2
View file @ 993fdf62
import("Favorites_lib");
import("Context_lib");
import("system.result");
import("Favorites_lib");
result.object(FavoritesUtil.getUserFavoriteGroups());
\ No newline at end of file
result.object(FavoritesUtil.getUserFavoriteGroupsByContext(ContextUtils.getCurrentContextId()));
\ No newline at end of file
entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod
+ 0
− 1
View file @ 993fdf62
......@@ -2,7 +2,6 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>DuplicateScannerResultFieldConfig_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/documentation.adoc</documentation>
<recordContainer>recordContainer</recordContainer>
<entityFields>
<entityProvider>
......
entity/Employee_entity/Employee_entity.aod
+ 1
− 0
View file @ 993fdf62
......@@ -64,6 +64,7 @@
<mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/Employee_entity/entityfields/email_address/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
<stateProcess>%aditoprj%/entity/Employee_entity/entityfields/email_address/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Employee_entity/entityfields/email_address/onValidation.js</onValidation>
</entityField>
<entityField>
......
entity/Employee_entity/entityfields/email_address/stateProcess.js 0 → 100644
+ 9
− 0
View file @ 993fdf62
import("system.result");
import("system.neon");
import("system.vars");
//the email should not be changed afterwards, because it is also used as calendar id
if (!vars.get("$field.EMAIL_ADDRESS") || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_READONLY);
entity/ExportTemplateSelection_entity/entityfields/safeandexport/onActionProcess.js
+ 4
− 2
View file @ 993fdf62
......@@ -9,6 +9,8 @@ var comingFrom = vars.get("$field.comingfrom");
if(templateId)
{
var document = ExportTemplateUtils.buildExport(templateId, selection, comingFrom, filename);
neon.download(document.content, document.filename);
var document = ExportTemplateUtils.buildExport(templateId, selection, comingFrom, filename);
neon.download(document.content, document.filename);
//since we do not open something after the download we need to close the window where the action is placed
neon.closeImage(vars.get("$sys.currentimage"), true);
}
\ No newline at end of file
entity/ExportTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js
+ 3
− 2
View file @ 993fdf62
import("Favorites_lib");
import("Context_lib");
import("system.result");
import("Favorites_lib");
result.object(FavoritesUtil.getUserFavoriteGroups());
\ No newline at end of file
result.object(FavoritesUtil.getUserFavoriteGroupsByContext(ContextUtils.getCurrentContextId()));
\ No newline at end of file
entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+ 0
− 1
View file @ 993fdf62
......@@ -90,7 +90,6 @@
<name>FilterAlreadyUsedByEntryId_param</name>
<valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/valueProcess.js</valueProcess>
<expose v="false" />
<documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/documentation.adoc</documentation>
</entityParameter>
</children>
</entityConsumer>
......
entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
+ 3
− 0
View file @ 993fdf62
......@@ -14,6 +14,7 @@
<name>FIELDNAME</name>
<title>Fieldname</title>
<consumer>KeywordImportFields</consumer>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
......@@ -26,10 +27,12 @@
<entityField>
<name>INPUTVALUE</name>
<title>Input value</title>
<mandatory v="true" />
</entityField>
<entityField>
<name>OUTPUTVALUE</name>
<title>Output value</title>
<mandatory v="true" />
</entityField>
<entityField>
<name>USER_NEW</name>
......
entity/LetterRecipient_entity/recordcontainers/db/recordfieldmappings/targetcontext.value/expression.js
+ 4
− 4
View file @ 993fdf62
import("Sql_lib");
import("Context_lib");
import("system.result");
// TODO: is prepared possible?
result.string("case when PERSON_ID is null then '" + ContextUtils.getContextName("Organisation")
+ "' when CONTACT.ORGANISATION_ID is not null and CONTACT.PERSON_ID is not null then '" + ContextUtils.getContextName("Person")
+ "' else '' end");
\ No newline at end of file
var sql = SqlBuilder.caseWhen("PERSON_ID is null").thenString(ContextUtils.getContextName("Organisation"))
.when(newWhere("CONTACT.ORGANISATION_ID is not null").and("CONTACT.PERSON_ID is not null")).thenString(ContextUtils.getContextName("Person"));
result.string(sql.toString());
\ No newline at end of file
entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod 0 → 100644
+ 85
− 0
View file @ 993fdf62
<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
<name>MarketingWorkflowLauncher_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Marketing workflow</title>
<recordContainer>dataLess</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
<entityField>
<name>DOCUMENTTEMPLATE_ID</name>
<title>Document template</title>
<consumer>EmailTemplates</consumer>
<mandatory v="true" />
<state>EDITABLE</state>
</entityField>
<entityConsumer>
<name>WorkflowLauncherIntegration</name>
<isOneToOneRelationship v="true" />
<dependency>
<name>dependency</name>
<entityName>WorkflowLauncher_entity</entityName>
<fieldName>Integration</fieldName>
</dependency>
<children>
<entityParameter>
<name>Validationerrors_param</name>
<valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/validationerrors_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ProcessVariables_param</name>
<valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/processvariables_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>Targets_param</name>
<valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targets_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>TargetContext_param</name>
<valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targetcontext_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
<name>ObjectType_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>ObjectIds_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>ObjectFilter_param</name>
<expose v="true" />
</entityParameter>
<entityConsumer>
<name>EmailTemplates</name>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplate_entity</entityName>
<fieldName>DocumentTemplateProvider</fieldName>
</dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
<valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/documenttemplatetype_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ComingFrom_param</name>
<valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/comingfrom_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<datalessRecordContainer>
<name>dataLess</name>
</datalessRecordContainer>
</recordContainers>
</entity>
entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/comingfrom_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ 993fdf62
import("Context_lib");
import("system.result");
result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
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