Skip to content
Snippets Groups Projects
Commit 264af18d authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

merged origin/2021.2.1 into 2021.2

parents ff6ade0a 6a106469
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 108 additions and 30 deletions
entity/BulkMailRecipient_entity/entityfields/recipientactions/children/startmarketingworkflows/onActionProcess.js
+ 4
− 2
View file @ 264af18d
import("system.neonFilter");
import("Util_lib");
import("system.entities");
import("Context_lib");
......@@ -28,7 +29,8 @@ rows = rows.map(function (row)
});
neon.openContext("MarketingWorkflowLauncher", "MarketingWorkflowLauncherEdit_view", null, neon.OPERATINGSTATE_VIEW, {
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
"ObjectIds_param": JSON.stringify(rows),
"ObjectType_param": ContextUtils.getCurrentContextId()
});
\ No newline at end of file
}).toString();
neon.openContextWithRecipe("MarketingWorkflowLauncher", "MarketingWorkflowLauncherEdit_view", recipe, neon.OPERATINGSTATE_VIEW);
entity/BulkMail_entity/entityfields/newmosaicotemplate/onActionProcess.js
+ 3
− 1
View file @ 264af18d
import("system.neonFilter");
import("system.neon");
import("system.vars")
......@@ -5,4 +6,5 @@ var params = {
"BulkMailId_param": vars.get("$field.BULKMAILID")
};
neon.openContext("BulkMailAddMosaico", "BulkMailAddMosaicoEdit_view",null, neon.OPERATINGSTATE_VIEW, params, null);
\ No newline at end of file
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
neon.openContextWithRecipe("BulkMailAddMosaico", "BulkMailAddMosaicoEdit_view", recipe, neon.OPERATINGSTATE_VIEW);
entity/CampaignAddParticipants_entity/entityfields/addparticipants/onActionProcess.js
+ 3
− 1
View file @ 264af18d
import("system.neonFilter");
import("system.workflow");
import("ActivityTask_lib");
import("Contact_lib");
......@@ -33,7 +34,8 @@ if(contactIds != null && contactIds.length > 0)
neon.refreshAll();
if (!vars.exists("$param.currentCampaignId_param") || !vars.get("$param.currentCampaignId_param"))
{
neon.openContext("Campaign", "CampaignMain_view", [campaignId], neon.OPERATINGSTATE_VIEW, null);
var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist([campaignId]).toString();
neon.openContextWithRecipe("Campaign", "CampaignMain_view", recipe, neon.OPERATINGSTATE_VIEW);
}
else
{
......
entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
+ 0
− 5
View file @ 264af18d
......@@ -64,11 +64,6 @@
<iconId>NEON:GROUP_APPOINTMENT</iconId>
<tooltipProcess>%aditoprj%/entity/CampaignPlanning_entity/entityfields/newganttentries/children/createnewcampaignstep_action/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>testfilter</name>
<title>testfilter</title>
<onActionProcess>%aditoprj%/entity/CampaignPlanning_entity/entityfields/newganttentries/children/testfilter/onActionProcess.js</onActionProcess>
</entityActionField>
</children>
</entityActionGroup>
<entityField>
......
entity/CampaignPlanning_entity/entityfields/newganttentries/children/testfilter/onActionProcess.js deleted 100644 → 0
+ 0
− 3
View file @ ff6ade0a
import("system.vars");
import("system.logging");
logging.log(JSON.stringify(vars.get("$sys.filter")));
\ No newline at end of file
entity/CampaignStep_entity/entityfields/newcampaignstep/onActionProcess.js
+ 4
− 2
View file @ 264af18d
import("system.neonFilter");
import("system.vars");
import("system.neon");
neon.openContext("CampaignStep", "CampaignStepEdit_view", null, neon.OPERATINGSTATE_NEW, {
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
campaignId_param: vars.get("$param.campaignId_param"),
predecessorstepId_param: vars.get("$field.CAMPAIGNSTEPID")
});
\ No newline at end of file
}).toString();
neon.openContextWithRecipe("CampaignStep", "CampaignStepEdit_view", recipe, neon.OPERATINGSTATE_NEW);
entity/CommunicationSettings_entity/CommunicationSettings_entity.aod
+ 8
− 0
View file @ 264af18d
......@@ -213,6 +213,10 @@
<contentType>BOOLEAN</contentType>
<valueProcess>%aditoprj%/entity/CommunicationSettings_entity/entityfields/isactive/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -319,6 +323,10 @@
<recordfield>COMMUNICATIONSETTINGS.ISACTIVE</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/CommunicationSettings_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/CommunicationSettings_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js 0 → 100644
+ 13
− 0
View file @ 264af18d
import("Product_lib");
import("Person_lib");
import("KeywordRegistry_basic");
import("Keyword_lib");
import("system.result");
import("Sql_lib");
var sqlMask = new SqlMaskingUtils();
var sql = sqlMask.concatenate(["'TEXT:'",
"(" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.communicationSettingStatus(), "COMMUNICATIONSETTINGS.STATUS") + ")"]);
result.string(sql.toString());
\ No newline at end of file
entity/Contact_entity/Contact_entity.aod
+ 13
− 0
View file @ 264af18d
......@@ -68,6 +68,10 @@
<name>ExcludeOrganisationsByPersonId</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>WithPrivate_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/withprivate_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
......@@ -214,6 +218,7 @@
<title>Company</title>
<consumer>Organisations</consumer>
<linkedContextProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_contactid/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_contactid/displayValueProcess.js</displayValueProcess>
<onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_contactid/onValidation.js</onValidation>
</entityField>
......@@ -270,6 +275,10 @@
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -362,6 +371,10 @@
<name>DEPARTMENT.displayValue</name>
<expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/department.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/Contact_entity/entityfields/organisation_id/valueProcess.js
+ 1
− 1
View file @ 264af18d
......@@ -3,7 +3,7 @@ import("system.result");
import("Contact_lib");
var orgContactId = vars.get("$field.ORGANISATION_CONTACTID");
var organisationIds = ContactUtils.getPersOrgIds(orgContactId)
var organisationIds = ContactUtils.getPersOrgIds(orgContactId);
if (organisationIds.length > 0 && organisationIds[2])
{
......
entity/Person_entity/recordcontainers/db/recordfieldmappings/title.displayvalue/expression.js → entity/Contact_entity/entityfields/organisations/children/withprivate_param/valueProcess.js
+ 1
− 1
View file @ 264af18d
import("system.result");
result.string("TITLE");
\ No newline at end of file
result.string(true);
\ No newline at end of file
entity/Contact_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js 0 → 100644
+ 12
− 0
View file @ 264af18d
import("Product_lib");
import("Person_lib");
import("KeywordRegistry_basic");
import("Keyword_lib");
import("system.result");
import("Sql_lib");
var sqlMask = new SqlMaskingUtils();
var sql = sqlMask.concatenate(["'TEXT:'", "ORGANISATION.NAME"]);
result.string(sql.toString());
\ No newline at end of file
entity/DSGVOConfiguration_entity/entityfields/opencontacts/onActionProcess.js
+ 4
− 2
View file @ 264af18d
import("system.neonFilter");
import("system.translate");
import("system.vars");
import("system.neon");
neon.openContext("Person", "PersonFilterOverlay_view", null, neon.OPERATINGSTATE_SEARCH , {
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
FilterPreSet_param: JSON.stringify(JSON.parse(vars.get("$field.FILTER")).filter)
});
\ No newline at end of file
}).toString();
neon.openContextWithRecipe("Person", "PersonFilterOverlay_view", recipe, neon.OPERATINGSTATE_SEARCH);
entity/DSGVO_entity/entityfields/reports/children/opendisclosurereport/onActionProcess.js
+ 6
− 5
View file @ 264af18d
import("system.neonFilter");
import("system.vars");
import("DataPrivacy_lib");
import("system.neon");
......@@ -14,8 +15,8 @@ if (entities.getRowCount(conf) > 0)
mode = neon.OPERATINGSTATE_EDIT;
}
neon.openContext("DSGVOInfo", "DSGVOInfoEdit_view", null, mode,
{
ContactId_param: vars.get("$field.CONTACT_ID"),
ReportType_param: DataPrivacyUtils.DisclosureReportName()
});
\ No newline at end of file
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
ContactId_param: vars.get("$field.CONTACT_ID"),
ReportType_param: DataPrivacyUtils.DisclosureReportName()
}).toString();
neon.openContextWithRecipe("DSGVOInfo", "DSGVOInfoEdit_view", recipe, mode);
entity/DSGVO_entity/entityfields/reports/children/openinforeport/onActionProcess.js
+ 6
− 5
View file @ 264af18d
import("system.neonFilter");
import("system.vars");
import("DataPrivacy_lib");
import("system.neon");
......@@ -14,8 +15,8 @@ if (entities.getRowCount(conf) > 0)
mode = neon.OPERATINGSTATE_EDIT;
}
neon.openContext("DSGVOInfo", "DSGVOInfoEdit_view", null, mode,
{
"param.ContactId_param": vars.get("$field.CONTACT_ID"),
"param.ReportType_param": "DSGVO_Information_report"
});
\ No newline at end of file
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
"param.ContactId_param": vars.get("$field.CONTACT_ID"),
"param.ReportType_param": "DSGVO_Information_report"
}).toString();
neon.openContextWithRecipe("DSGVOInfo", "DSGVOInfoEdit_view", recipe, mode);
entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
+ 8
− 0
View file @ 264af18d
......@@ -69,6 +69,10 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -100,6 +104,10 @@
<name>LANG.displayValue</name>
<expression>%aditoprj%/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/lang.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js 0 → 100644
+ 12
− 0
View file @ 264af18d
import("Product_lib");
import("Person_lib");
import("KeywordRegistry_basic");
import("Keyword_lib");
import("system.result");
import("Sql_lib");
var sqlMask = new SqlMaskingUtils();
var sql = sqlMask.concatenate(["'TEXT:'", "(" + LanguageKeywordUtils.getResolvedTitleSqlPart("DESCRIPTIONTRANSLATION.LANG") + ")"]);
result.string(sql.toString());
entity/DistrictContact_entity/entityfields/filterviewactiongroup/children/changevalidity/onActionProcess.js
+ 3
− 1
View file @ 264af18d
import("system.neonFilter");
import("system.translate");
import("system.neon");
import("Context_lib");
......@@ -24,4 +25,5 @@ var params = {
"DistrictContactIds_param": JSON.stringify(districtContactIds)
}
neon.openContext("DistrictChangeValidityDates", "DistrictChangeValidityDatesEdit_view", null, neon.OPERATINGSTATE_NEW, params, null);
\ No newline at end of file
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
neon.openContextWithRecipe("DistrictChangeValidityDates", "DistrictChangeValidityDatesEdit_view", recipe, neon.OPERATINGSTATE_NEW);
entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+ 4
− 0
View file @ 264af18d
......@@ -344,6 +344,10 @@
<name>CreateFromMosaicoTemplateId_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>Language_param</name>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/DocumentTemplate_entity/entityfields/openhtmleditor/onActionProcess.js
+ 3
− 1
View file @ 264af18d
import("system.neonFilter");
import("system.logging");
import("system.vars");
import("DocumentTemplate_lib");
import("system.neon");
neon.openContext("DocumentTemplate", "DocumentTemplateHtmlEdit_view", [vars.get("$field.DOCUMENTTEMPLATEID")], neon.OPERATINGSTATE_EDIT, null)
var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist([vars.get("$field.DOCUMENTTEMPLATEID")]).toString();
neon.openContextWithRecipe("DocumentTemplate", "DocumentTemplateHtmlEdit_view", recipe, neon.OPERATINGSTATE_EDIT);
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