mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-05-01 00:15:00 -04:00
Sending HTML emails now so that Front will eat them
This commit is contained in:
parent
3ca32f93a1
commit
feeca7a586
1 changed files with 3 additions and 2 deletions
|
@ -55,6 +55,7 @@ createMailContext = (req, done) ->
|
||||||
email_data:
|
email_data:
|
||||||
subject: "[CodeCombat] #{subject ? ('Feedback - ' + fromAddress)}"
|
subject: "[CodeCombat] #{subject ? ('Feedback - ' + fromAddress)}"
|
||||||
content: content
|
content: content
|
||||||
|
contentHTML: content.replace /\n/g, '\n<br>'
|
||||||
if recipientID is 'schools@codecombat.com' or teacher
|
if recipientID is 'schools@codecombat.com' or teacher
|
||||||
req.user.update({$set: { enrollmentRequestSent: true }}).exec(_.noop) if recipientID is 'schools@codecombat.com'
|
req.user.update({$set: { enrollmentRequestSent: true }}).exec(_.noop) if recipientID is 'schools@codecombat.com'
|
||||||
closeIO.getSalesContactEmail fromAddress, (err, salesContactEmail) ->
|
closeIO.getSalesContactEmail fromAddress, (err, salesContactEmail) ->
|
||||||
|
@ -78,7 +79,7 @@ createMailContext = (req, done) ->
|
||||||
], (err, results) ->
|
], (err, results) ->
|
||||||
console.error "Error getting contact message context for #{sender}: #{err}" if err
|
console.error "Error getting contact message context for #{sender}: #{err}" if err
|
||||||
if req.body.screenshotURL
|
if req.body.screenshotURL
|
||||||
context.email_data.content += "\n<img src='#{req.body.screenshotURL}' />"
|
context.email_data.contentHTML += "\n<br><img src='#{req.body.screenshotURL}' />"
|
||||||
done context
|
done context
|
||||||
|
|
||||||
fetchRecentSessions = (user, context, sentFromLevel, callback) ->
|
fetchRecentSessions = (user, context, sentFromLevel, callback) ->
|
||||||
|
@ -98,5 +99,5 @@ fetchRecentSessions = (user, context, sentFromLevel, callback) ->
|
||||||
if sentFromLevel?.levelID is s.levelID and sentFromLevel?.courseID
|
if sentFromLevel?.levelID is s.levelID and sentFromLevel?.courseID
|
||||||
url += "&course=#{sentFromLevel.courseID}&course-instance=#{sentFromLevel.courseInstanceID}"
|
url += "&course=#{sentFromLevel.courseID}&course-instance=#{sentFromLevel.courseInstanceID}"
|
||||||
urlName += ' (course)'
|
urlName += ' (course)'
|
||||||
context.email_data.content += "\n<a href='#{url}'>#{urlName}</a>#{sessionStatus}"
|
context.email_data.contentHTML += "\n<br><a href='#{url}'>#{urlName}</a>#{sessionStatus}"
|
||||||
callback null
|
callback null
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue