espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

email insert email confirm

Browse Source
This commit is contained in:
yuri
2018-03-20 13:05:55 +02:00
parent 286fd7e0ce
commit 8a98cca4fa
2 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Resources/i18n/en_US/Email.json
+2 -1
View File
@@ -102,7 +102,8 @@
"noSmtpSetup": "No SMTP setup. {link}.",
"testEmailSent": "Test email has been sent",
"emailSent": "Email has been sent",
"savedAsDraft": "Saved as draft"
"savedAsDraft": "Saved as draft",
"confirmInsertTemplate": "The email body will be lost. Are you sure you want to insert the template?"
},
"presetFilters": {
"sent": "Sent",
client/src/views/email/record/compose.js
+44 -20
View File
@@ -54,30 +54,27 @@ Espo.define('views/email/record/compose', ['views/record/edit', 'views/email/rec
}
this.listenTo(this.model, 'insert-template', function (data) {
var body = data.body;
if (this.hasSignature()) {
body = this.appendSignature(body || '', data.isHtml);
}
this.model.set('isHtml', data.isHtml);
this.model.set('name', data.subject);
this.model.set('body', '');
this.model.set('body', body);
var body = this.model.get('body');
if (this.options.keepAttachmentsOnSelectTemplate) {
this.initialAttachmentsIds.forEach(function (id) {
if (data.attachmentsIds) {
data.attachmentsIds.push(id);
}
if (data.attachmentsNames) {
data.attachmentsNames[id] = this.initialAttachmentsNames[id] || id;
}
var bodyPlain = body.replace(/<br\s*\/?>/mg, '');
bodyPlain = bodyPlain.replace(/<\/p\s*\/?>/mg, '');
bodyPlain = bodyPlain.replace(/ /g, '');
bodyPlain = bodyPlain.replace(/\n/g, '');
var $div = $('<div>').html(bodyPlain);
bodyPlain = $div.text();
if (bodyPlain !== '' && this.model.get('body') !== this.attributes.body) {
this.confirm({
message: this.translate('confirmInsertTemplate', 'messages', 'Email'),
confirmText: this.translate('Yes')
}, function () {
this.insertTemplate(data);
}, this);
} else {
this.insertTemplate(data);
}
this.model.set({
attachmentsIds: data.attachmentsIds,
attachmentsNames: data.attachmentsNames
});
}, this);
if (this.options.selectTemplateDisabled) {
@@ -85,6 +82,33 @@ Espo.define('views/email/record/compose', ['views/record/edit', 'views/email/rec
}
},
insertTemplate: function (data) {
var body = data.body;
if (this.hasSignature()) {
body = this.appendSignature(body || '', data.isHtml);
}
this.model.set('isHtml', data.isHtml);
this.model.set('name', data.subject);
this.model.set('body', '');
this.model.set('body', body);
if (this.options.keepAttachmentsOnSelectTemplate) {
this.initialAttachmentsIds.forEach(function (id) {
if (data.attachmentsIds) {
data.attachmentsIds.push(id);
}
if (data.attachmentsNames) {
data.attachmentsNames[id] = this.initialAttachmentsNames[id] || id;
}
}, this);
}
this.model.set({
attachmentsIds: data.attachmentsIds,
attachmentsNames: data.attachmentsNames
});
},
prependSignature: function (body, isHtml) {
if (isHtml) {
var signature = this.getSignature();