diff --git a/client/modules/crm/res/templates/campaign/modals/mail-merge-pdf.tpl b/client/modules/crm/res/templates/campaign/modals/mail-merge-pdf.tpl index acc3463352..648fa6e6f4 100644 --- a/client/modules/crm/res/templates/campaign/modals/mail-merge-pdf.tpl +++ b/client/modules/crm/res/templates/campaign/modals/mail-merge-pdf.tpl @@ -1,10 +1,11 @@ - -
-
- +
+
+
+ +
diff --git a/client/modules/crm/src/views/campaign/modals/mail-merge-pdf.js b/client/modules/crm/src/views/campaign/modals/mail-merge-pdf.js index ac136b5f7a..d04aae64a7 100644 --- a/client/modules/crm/src/views/campaign/modals/mail-merge-pdf.js +++ b/client/modules/crm/src/views/campaign/modals/mail-merge-pdf.js @@ -26,7 +26,8 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -define('crm:views/campaign/modals/mail-merge-pdf', ['views/modal', 'model'], function (Dep, Model) { +define('crm:views/campaign/modals/mail-merge-pdf', ['views/modal', 'ui/select'], +function (Dep, /** module:ui/select */ Select) { return Dep.extend({ @@ -51,7 +52,8 @@ define('crm:views/campaign/modals/mail-merge-pdf', ['views/modal', 'model'], fun return; } - var targetEntityType = this.getMetadata().get(['entityDefs', 'TargetList', 'links', link, 'entity']); + let targetEntityType = this.getMetadata() + .get(['entityDefs', 'TargetList', 'links', link, 'entity']); if (!this.getAcl().checkScope(targetEntityType)) { return; @@ -72,8 +74,13 @@ define('crm:views/campaign/modals/mail-merge-pdf', ['views/modal', 'model'], fun }); }, + afterRender: function () { + Select.init(this.$el.find('.field[data-name="link"] select')); + }, + actionProceed: function () { - var link = this.$el.find('.field[data-name="link"] select').val(); + let link = this.$el.find('.field[data-name="link"] select').val(); + this.trigger('proceed', link); }, });