projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '5.26' of https://github.com/civicrm/civicrm-core
[civicrm-core.git]
/
ang
/
crmMailing
/
BlockPreview.js
diff --git
a/ang/crmMailing/BlockPreview.js
b/ang/crmMailing/BlockPreview.js
index c2b692462e53dc8388eca0cac11e66ce74833e20..334e15d4408d2b5e2170bbce95f3b6361dec3303 100644
(file)
--- a/
ang/crmMailing/BlockPreview.js
+++ b/
ang/crmMailing/BlockPreview.js
@@
-21,6
+21,7
@@
});
};
scope.doSend = function doSend(recipient) {
});
};
scope.doSend = function doSend(recipient) {
+ recipient = JSON.parse(JSON.stringify(recipient).replace(/\,\s/g, ','));
scope.$eval(attr.onSend, {
preview: {recipient: recipient}
});
scope.$eval(attr.onSend, {
preview: {recipient: recipient}
});
@@
-47,7
+48,7
@@
markup += '</ol>';
markup = '<h4>' + ts('A test message will be sent to %1 people:', {1: count}) + '</h4>' + markup;
if (!count) {
markup += '</ol>';
markup = '<h4>' + ts('A test message will be sent to %1 people:', {1: count}) + '</h4>' + markup;
if (!count) {
- markup = '<div class="messages status"><i class="crm-i fa-exclamation-triangle"></i> ' +
+ markup = '<div class="messages status"><i class="crm-i fa-exclamation-triangle"
aria-hidden="true"
></i> ' +
(data.contact.count ? ts('None of the contacts in this group have an email address.') : ts('Group is empty.')) +
'</div>';
}
(data.contact.count ? ts('None of the contacts in this group have an email address.') : ts('Group is empty.')) +
'</div>';
}