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

Merge branch '2021.2.2' into '2021.2' 

[Projekt: xRM-ContactManagement][TicketNr.: 2002229][Icon bei der Aktion...

See merge request xrm/basic!1531
parents 6f78e5e8 fffaf87c
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1989 additions and 1624 deletions
.liquibase/Data_alias/basic/2021.2.2/Mosaico/insert_mosaico_color_keyword.xml
+ 14
− 4
View file @ a64a3b57
......@@ -17,7 +17,7 @@
<column name="CONTAINER" value="MosaicoColor"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6f3b9635-679c-47b4-9fe3-0770aaca719c"/>
......@@ -27,7 +27,7 @@
<column name="CONTAINER" value="MosaicoColor"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b9ce199e-a4e1-4b48-ba61-85ee6139b89c"/>
......@@ -37,7 +37,7 @@
<column name="CONTAINER" value="MosaicoColor"/>
<column name="SORTING" valueNumeric="3"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="09f299f7-9faa-40c4-a53d-e7b5c33dca53"/>
......@@ -47,7 +47,17 @@
<column name="CONTAINER" value="MosaicoColor"/>
<column name="SORTING" valueNumeric="4"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="692699de-d7ad-4500-b71e-153555a2ceac"/>
<column name="AB_KEYWORD_CATEGORY_ID" value="dc4cc24d-5df2-481f-a028-8d22ce6f6e64"/>
<column name="KEYID" value="FFFFFF"/>
<column name="TITLE" value="White"/>
<column name="CONTAINER" value="MosaicoColor"/>
<column name="SORTING" valueNumeric="5"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/basic/2021.2.2/alter_display-name_prospective-customer.xml 0 → 100644
+ 9
− 0
View file @ a64a3b57
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="d.tran" id="5e9314bc-291b-4396-a155-e1a06afcbb1c">
<update tableName="AB_ATTRIBUTE">
<column name="ATTRIBUTE_NAME" value="Existing customer" />
<where>AB_ATTRIBUTEID = 'be3b5fe2-2146-4eab-80a4-3c1cf4d6156a'</where>
</update>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.2.2/alter_display-value_task-status-completed_keyword.xml 0 → 100644
+ 9
− 0
View file @ a64a3b57
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="d.tran" id="8f556a75-720c-45b6-9cfe-c26308f96a65">
<update tableName="AB_KEYWORD_ENTRY">
<column name="TITLE" value="completed" />
<where>AB_KEYWORD_ENTRYID = '7311d8c5-edf2-492e-be4d-6f0469334611'</where>
</update>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.2.2/alter_relation-type-title_grandchildof.xml 0 → 100644
+ 9
− 0
View file @ a64a3b57
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="d.tran" id="f420d656-da64-4ac2-aa10-8ce529479240">
<update tableName="AB_OBJECTRELATIONTYPE">
<column name="RELATION_TITLE" value="grandchild of" />
<where>AB_OBJECTRELATIONTYPEID = 'a2296f93-2371-4ab8-9f29-ef0795d1e9b2'</where>
</update>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.2.2/changelog.xml
+ 6
− 1
View file @ a64a3b57
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include relativeToChangelogFile="true" file="alter_relation-type-title_grandchildof.xml"/>
<include relativeToChangelogFile="true" file="alter_display-value_task-status-completed_keyword.xml"/>
<include relativeToChangelogFile="true" file="alter_display-name_prospective-customer.xml"/>
<include relativeToChangelogFile="true" file="Offer/changelog.xml"/>
<include relativeToChangelogFile="true" file="lead_nurturing/changelog.xml"/>
<include relativeToChangelogFile="true" file="add_offer_showprice.xml"/>
<include relativeToChangelogFile="true" file="Ticket/changelog.xml"/>
<include relativeToChangelogFile="true" file="StandardColumns/changelog.xml"/>
......
.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/alter_bulkmail.xml 0 → 100644
+ 13
− 0
View file @ a64a3b57
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="m.groppe" id="1801edd3-72d9-4297-8b9b-7ac14cb57884">
<addColumn tableName="BULKMAIL">
<column name="CAMPAIGN_ID" type="CHAR(36)"/>
</addColumn>
<createIndex indexName="IDX_BULKMAIL_CAMPAIGN_ID" tableName="BULKMAIL">
<column name="CAMPAIGN_ID" />
</createIndex>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/changelog.xml 0 → 100644
+ 8
− 0
View file @ a64a3b57
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include relativeToChangelogFile="true" file="alter_bulkmail.xml"/>
<include relativeToChangelogFile="true" file="insert_adHocMailBulkMailStatus.xml"/>
<include relativeToChangelogFile="true" file="insert_documentTemplateTypeDownload.xml"/>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_adHocMailBulkMailStatus.xml 0 → 100644
+ 21
− 0
View file @ a64a3b57
<?xml version="1.0" encoding="UTF-8"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="m.groppe" id="246a1182-ff3c-461a-b533-ae305f0468a6">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b0fe2c5e-7195-497c-9a47-5837e0ce30a8"/>
<column name="KEYID" value="BULKMAILADHOC"/>
<column name="TITLE" value="Ad hoc"/>
<column name="CONTAINER" value="BulkMailStatus"/>
<column name="AB_KEYWORD_CATEGORY_ID" value="76fc02b9-a1b6-4c76-bdd5-a52d0e1ef286"/>
<column name="SORTING" valueNumeric="6"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="cfb85e46-8af0-432c-a783-251333c999bf"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
<column name="AB_KEYWORD_ENTRY_ID" value="b0fe2c5e-7195-497c-9a47-5837e0ce30a8"/>
<column name="CHAR_VALUE" value="VAADIN:ENVELOPE_OPEN"/>
</insert>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_documentTemplateTypeDownload.xml 0 → 100644
+ 16
− 0
View file @ a64a3b57
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="m.groppe" id="212e1f2b-9913-4555-b7d4-74b848c4712e">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="ec364de4-a2ef-47f0-a9ec-adec4496fbd0"/>
<column name="AB_KEYWORD_CATEGORY_ID" value="b5afd40b-bfa7-4aee-89ea-06b8c7deb304"/>
<column name="KEYID" value="DOWNLOAD"/>
<column name="TITLE" value="Download"/>
<column name="SORTING" valueNumeric="5"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
+ 1
− 1
View file @ a64a3b57
......@@ -90,7 +90,7 @@
<column name="HIERARCHY" valueNumeric="0"/>
<column name="ICON" value="VAADIN:FAMILY"/>
<column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
<column name="RELATION_TITLE" value="Grandchild of"/>
<column name="RELATION_TITLE" value="grandchild of"/>
</insert>
<insert tableName="ab_objectrelationtype">
<column name="SIDE" valueNumeric="2"/>
......
.liquibase/Data_alias/basic/_demoData/generatedData/weblink.xml
+ 40
− 1
View file @ a64a3b57
......@@ -59,7 +59,7 @@
<column name="LINKTYPE" value="WEBLINK_EMAIL"/>
<column name="USER_EDIT" value="Lisa Sommer"/>
<column name="URL" value="http://www.adito.de"/>
<column name="USER_NEW" value="Admin"/>
<column name="USER_NEW" value="Lisa Sommer"/>
<column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
<column name="SCORE" valueNumeric="0"/>
<column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
......@@ -67,5 +67,44 @@
<column name="ISREDIRECT" valueNumeric="1"/>
<column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
</insert>
<insert tableName="weblink">
<column name="WEBLINKID" value="c82da3d0-8156-4dd5-86f2-ad68ea3d11ef"/>
<column name="LINKTYPE" value="WEBLINK_EMAIL"/>
<column name="USER_EDIT" value="Lisa Sommer"/>
<column name="URL" value="https://www.adito.de/unternehmen/philosophie.html"/>
<column name="USER_NEW" value="Lisa Sommer"/>
<column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
<column name="SCORE" valueNumeric="0"/>
<column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
<column name="PLACEHOLDER" value="adito_about"/>
<column name="ISREDIRECT" valueNumeric="1"/>
<column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
</insert>
<insert tableName="weblink">
<column name="WEBLINKID" value="75b2ca5c-e270-45ad-9ade-7f70a15674b4"/>
<column name="LINKTYPE" value="WEBLINK_EMAIL"/>
<column name="USER_EDIT" value="Lisa Sommer"/>
<column name="URL" value="https://www.adito.de/impressum.html"/>
<column name="USER_NEW" value="Lisa Sommer"/>
<column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
<column name="SCORE" valueNumeric="0"/>
<column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
<column name="PLACEHOLDER" value="adito_impressum"/>
<column name="ISREDIRECT" valueNumeric="1"/>
<column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
</insert>
<insert tableName="weblink">
<column name="WEBLINKID" value="ea7300fc-ee2d-49e6-8eb2-ff5b5922737a"/>
<column name="LINKTYPE" value="WEBLINK_EMAIL"/>
<column name="USER_EDIT" value="Lisa Sommer"/>
<column name="URL" value="https://www.adito.de/kontakt/formular.html"/>
<column name="USER_NEW" value="Lisa Sommer"/>
<column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
<column name="SCORE" valueNumeric="0"/>
<column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
<column name="PLACEHOLDER" value="adito_contact"/>
<column name="ISREDIRECT" valueNumeric="1"/>
<column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
+ 6
− 0
View file @ a64a3b57
......@@ -16,6 +16,12 @@ var res = {
"connectionField":"TASK_REQUESTOR_CONTACT_ID",
"setGroupBy":"NameFor360"
},
"Campaign": {
"subContext":"CampaignParticipant",
"childField":"CAMPAIGN_ID",
"parentField":"CAMPAIGNID",
"contactIdField":"CONTACT_ID"
},
"Advertising": {},
"BulkMail": {
"subContext":"BulkMailRecipient",
......
entity/Activity_entity/entityfields/infotable/valueProcess.js
+ 6
− 1
View file @ a64a3b57
......@@ -2,4 +2,9 @@ import("system.result");
import("system.vars");
import("system.text");
result.string(text.html2text(vars.get("$field.INFO")));
\ No newline at end of file
// Remove all linebreaks
let info = vars.get("$field.INFO").replace(/\n/ig, "");
// Remove all styles --> styles have no effect on the later text and they and these cause problems when converting
info = info.replace(/style=\".*\"/ig, "");
result.string(text.html2text(info));
entity/AnyContact_entity/AnyContact_entity.aod
+ 1
− 1
View file @ a64a3b57
<?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.22" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.22">
<name>AnyContact_entity</name>
<title>Contact</title>
<title>Contact or company</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
<contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
......
entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js
+ 3
− 1
View file @ a64a3b57
import("system.vars");
import("system.result");
import("Communication_lib");
import("Contact_lib")
var res = CommUtil.getStandardSubSqlPhone();
var res = CommUtil.getStandardSubSqlPhone(undefined, ContactUtils.getContactTypeByContactId(vars.get("$field.CONTACTID")));
result.string(res);
\ No newline at end of file
entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
+ 4
− 0
View file @ a64a3b57
......@@ -84,6 +84,10 @@
<name>Parameters_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>RecordsRecipe_param</name>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<datalessRecordContainer>
......
entity/BulkMailAddRecipients_entity/entityfields/proposedcontactids/valueProcess.js
+ 43
− 3
View file @ a64a3b57
import("system.neonFilter");
import("Context_lib");
import("system.entities");
import("Sql_lib");
......@@ -14,12 +15,29 @@ if (bulkMailId)
var filter = vars.get("$param.Filter_param");
var context = vars.getString("$param.ObjectType_param");
var parameters = vars.get("$param.Parameters_param");
var recordsRecipe = vars.get("$param.RecordsRecipe_param");
if(!Utils.isNullOrEmptyString(recordsRecipe))
{
var loadConfig = entities.createConfigForLoadingRows()
.fromEntityRecordsRecipe(recordsRecipe);
context = ContextUtils.getContextId(JSON.parse(recordsRecipe).entityName);
}
switch(context)
{
case "CampaignParticipant":
if (Utils.isNullOrEmpty(ids) && filter)
if (!Utils.isNullOrEmpty(recordsRecipe))
{
loadConfig.fields(["CONTACT_ID"]);
proposedRecipients = entities.getRows(loadConfig).map(function (row)
{
return row["CONTACT_ID"];
});
}
else if (Utils.isNullOrEmpty(ids) && filter)
{
var filterObject = Utils.isString(filter) ? JSON.parse(filter) : filter;
......@@ -55,14 +73,36 @@ if (bulkMailId)
}
break;
case "CampaignStep":
var proposedIds = FilterViewActionUtils.getUidsBySelectionOrFilter(context, ids, filter, parameters);
if (!Utils.isNullOrEmpty(recordsRecipe))
{
loadConfig.fields(["CAMPAIGNSTEPID"]);
proposedIds = entities.getRows(loadConfig).map(function (row)
{
return row["CAMPAIGNSTEPID"];
});
}
else
{
var proposedIds = FilterViewActionUtils.getUidsBySelectionOrFilter(context, ids, filter, parameters);
}
proposedRecipients = newSelect("CAMPAIGNPARTICIPANT.CONTACT_ID")
.from("CAMPAIGNPARTICIPANT")
.where("CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID", proposedIds, SqlBuilder.IN())
.arrayColumn();
break;
default:
proposedRecipients = FilterViewActionUtils.getUidsBySelectionOrFilter(context, ids, filter, parameters);
if(!Utils.isNullOrEmpty(recordsRecipe))
{
loadConfig.fields(["CONTACTID"]);
proposedRecipients = entities.getRows(loadConfig).map(function (row)
{
return row["CONTACTID"];
});
}
else
{
proposedRecipients = FilterViewActionUtils.getUidsBySelectionOrFilter(context, ids, filter, parameters);
}
}
}
......
entity/BulkMailAddRecipients_entity/entityfields/validcontactids/valueProcess.js
+ 8
− 2
View file @ a64a3b57
import("system.neonFilter");
import("Util_lib");
import("system.result");
import("Bulkmail_lib");
......@@ -8,6 +9,7 @@ var bulkMailId = vars.get("$field.BULKMAIL_ID");
var filter = vars.get("$param.Filter_param");
var ids = Utils.parseJSON(vars.get("$param.Ids_param"));
var context = vars.getString("$param.ObjectType_param");
var recordsRecipe = vars.get("$param.RecordsRecipe_param");
if (Utils.isString(filter))
{
......@@ -17,13 +19,17 @@ var validRecipients = [];
if (bulkMailId)
{
if (Utils.isNullOrEmpty(ids) && filter && filter.condition)
if (!Utils.isNullOrEmptyString(recordsRecipe))
{
validRecipients = BulkMailUtils.filterNewRecipientsByRecordsRecipe(bulkMailId, recordsRecipe);
}
else if (Utils.isNullOrEmpty(ids) && filter && filter.condition)
{
validRecipients = BulkMailUtils.filterNewRecipientsByCondition(bulkMailId, filter.condition, context)
}
else if (context == "CampaignStep")
{
validRecipients = BulkMailUtils.filterNewRecipientsByCondition(bulkMailId, newWhere("CAMPAIGNSTEP.CAMPAIGNSTEPID", pIds, SqlBuilder.IN()), context);
validRecipients = BulkMailUtils.filterNewRecipientsByCondition(bulkMailId, newWhere("CAMPAIGNSTEP.CAMPAIGNSTEPID", ids, SqlBuilder.IN()), context);
}
else
{
......
entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+ 5
− 8
View file @ a64a3b57
......@@ -8,6 +8,7 @@
<siblings>
<element>Communication_entity</element>
</siblings>
<recordsRecipeSupported v="true" />
<titlePlural>Recipients</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
......@@ -116,14 +117,6 @@
<iconId>VAADIN:BAN</iconId>
<tooltipProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/removewithcommrestriction/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>startMarketingWorkflows</name>
<title>Start marketing mailing</title>
<onActionProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/startmarketingworkflows/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<iconId>VAADIN:ENVELOPES</iconId>
<tooltipProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/startmarketingworkflows/tooltipProcess.js</tooltipProcess>
</entityActionField>
</children>
</entityActionGroup>
<entityField>
......@@ -142,6 +135,10 @@
<name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/emailadresses/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/emailadresses/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityProvider>
......
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