Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dev/mail#20 : Preview screen doesn't open until recipients list is built on mail compose screen #12509

Merged
merged 2 commits into from
Aug 28, 2018
Merged

dev/mail#20 : Preview screen doesn't open until recipients list is built on mail compose screen #12509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24689c7
dev/mail#20 : Preview screen don't open until recipients list is buil…
monishdeb Jul 18, 2018
0075b0c
dev/mail#20 : Preview screen don't open until recipients list is buil…
monishdeb Jul 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions ang/crmMailing/services.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,26 +262,24 @@
// @param mailing Object (per APIv3)
// @return Promise an object with "subject", "body_text", "body_html"
preview: function preview(mailing) {
return this.getPreviewContent(qApi, mailing);
},

// @param backend
// @param mailing Object (per APIv3)
// @return preview content
getPreviewContent: function getPreviewContent(backend, mailing) {
if (CRM.crmMailing.workflowEnabled && !CRM.checkPerm('create mailings') && !CRM.checkPerm('access CiviMail')) {
return qApi('Mailing', 'preview', {id: mailing.id}).then(function(result) {
return backend('Mailing', 'preview', {id: mailing.id}).then(function(result) {
return result.values;
});
}
else {
// Protect against races in saving and previewing by chaining create+preview.
var params = angular.extend({}, mailing, mailing.recipients, {
id: mailing.id,
'api.Mailing.preview': {
id: '$value.id'
}
});
delete params.scheduled_date;
delete params.recipients; // the content was merged in
params._skip_evil_bao_auto_recipients_ = 1; // skip recipient rebuild on mail preview
return qApi('Mailing', 'create', params).then(function(result) {
mailing.modified_date = result.values[result.id].modified_date;
var params = angular.extend({}, mailing);
delete params.id;
return backend('Mailing', 'preview', params).then(function(result) {
// changes rolled back, so we don't care about updating mailing
return result.values[result.id]['api.Mailing.preview'].values;
return result.values;
});
}
},
Expand Down Expand Up @@ -451,7 +449,7 @@
};
var result = null;
var p = crmMailingMgr
.preview(mailing)
.getPreviewContent(CRM.api3, mailing)
.then(function (content) {
var options = CRM.utils.adjustDialogDefaults({
autoOpen: false,
Expand Down
19 changes: 10 additions & 9 deletions api/v3/Mailing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,21 +547,22 @@ function civicrm_api3_mailing_event_open($params) {
* @throws \API_Exception
*/
function civicrm_api3_mailing_preview($params) {
civicrm_api3_verify_mandatory($params,
'CRM_Mailing_DAO_Mailing',
array('id'),
FALSE
);

$fromEmail = NULL;
if (!empty($params['from_email'])) {
$fromEmail = $params['from_email'];
}

$session = CRM_Core_Session::singleton();
$mailing = new CRM_Mailing_BAO_Mailing();
$mailing->id = $params['id'];
$mailing->find(TRUE);
$mailingID = CRM_Utils_Array::value('id', $params);
if ($mailingID) {
$mailing->id = $mailingID;
$mailing->find(TRUE);
}
else {
$mailing->copyValues($params);
}

$session = CRM_Core_Session::singleton();

CRM_Mailing_BAO_Mailing::tokenReplace($mailing);

Expand Down