hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-06 10:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't forget to await!

Browse source
This commit is contained in:
SachaG 2017-09-30 11:47:41 +09:00
parent ef2bed1902
commit 0fb9771376
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/vulcan-core/lib/modules/components/Card.jsx
View file

@ -45,7 +45,7 @@ const LimitedString = ({ string }) =>
export const getFieldValue = (value, typeName) => { export const getFieldValue = (value, typeName) => {
if (typeof value === 'undefined') { if (typeof value === 'undefined' || value === null) {
return '' return ''
} }

4
packages/vulcan-email/lib/server/email.js
View file

@ -121,6 +121,7 @@ VulcanEmail.build = async ({ emailName, variables }) => {
const data = email.data ? {...result.data, ...email.data(variables)} : result.data; const data = email.data ? {...result.data, ...email.data(variables)} : result.data;
const subject = typeof email.subject === 'function' ? email.subject(data) : email.subject; const subject = typeof email.subject === 'function' ? email.subject(data) : email.subject;
const html = VulcanEmail.buildTemplate(VulcanEmail.getTemplate(email.template)(data)); const html = VulcanEmail.buildTemplate(VulcanEmail.getTemplate(email.template)(data));
return { data, subject, html }; return { data, subject, html };
@ -128,8 +129,7 @@ VulcanEmail.build = async ({ emailName, variables }) => {
VulcanEmail.buildAndSend = async ({ to, emailName, variables }) => { VulcanEmail.buildAndSend = async ({ to, emailName, variables }) => {
const email = VulcanEmail.build({ to, emailName, variables }); const email = await VulcanEmail.build({ to, emailName, variables });
return VulcanEmail.send(to, email.subject, email.html); return VulcanEmail.send(to, email.subject, email.html);
}; };