From 7050757e4ef2a759091b473d558d3031b9b7f7eb Mon Sep 17 00:00:00 2001 From: yuri Date: Tue, 20 Oct 2015 17:22:52 +0300 Subject: [PATCH 1/2] fix campaign type --- .../Modules/Crm/Resources/metadata/entityDefs/Campaign.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Campaign.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Campaign.json index 97fe5599bc..81e79aebc6 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Campaign.json +++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Campaign.json @@ -11,7 +11,8 @@ }, "type": { "type": "enum", - "options": ["Email", "Newsletter", "Web", "Television", "Radio", "Mail"] + "options": ["Email", "Newsletter", "Web", "Television", "Radio", "Mail"], + "default": "Email" }, "startDate": { "type": "date" From a16919f10b8328324a104134ed12f277a75b1b96 Mon Sep 17 00:00:00 2001 From: yuri Date: Tue, 20 Oct 2015 17:38:04 +0300 Subject: [PATCH 2/2] fix typo --- .../crm/src/views/mass-email/record/row-actions/for-campaign.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/client/modules/crm/src/views/mass-email/record/row-actions/for-campaign.js b/frontend/client/modules/crm/src/views/mass-email/record/row-actions/for-campaign.js index 9318645a2a..24d8268f1e 100644 --- a/frontend/client/modules/crm/src/views/mass-email/record/row-actions/for-campaign.js +++ b/frontend/client/modules/crm/src/views/mass-email/record/row-actions/for-campaign.js @@ -29,7 +29,7 @@ Espo.define('crm:views/mass-email/record/row-actions/for-campaign', 'views/recor if (this.options.acl.edit && !~['Complete'].indexOf(this.model.get('status'))) { actionList.unshift({ action: 'sendTest', - label: 'Sent Test', + label: 'Send Test', data: { id: this.model.id }