codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-12 08:41:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Matt Lott 2016-07-19 09:29:11 -07:00
commit f43012c7a6
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/User.coffee
View file

@ -19,10 +19,10 @@ module.exports = class User extends CocoModel
displayName: -> @get('name', true) displayName: -> @get('name', true)
broadName: -> broadName: ->
return '(deleted)' if @get('deleted') return '(deleted)' if @get('deleted')
name = @get('name')
return name if name
name = _.filter([@get('firstName'), @get('lastName')]).join(' ') name = _.filter([@get('firstName'), @get('lastName')]).join(' ')
return name if name return name if name
name = @get('name')
return name if name
[emailName, emailDomain] = @get('email')?.split('@') or [] [emailName, emailDomain] = @get('email')?.split('@') or []
return emailName if emailName return emailName if emailName
return 'Anonymous' return 'Anonymous'

4
server/models/User.coffee
View file

@ -44,10 +44,10 @@ UserSchema.post('init', ->
UserSchema.methods.broadName = -> UserSchema.methods.broadName = ->
return '(deleted)' if @get('deleted') return '(deleted)' if @get('deleted')
name = @get('name')
return name if name
name = _.filter([@get('firstName'), @get('lastName')]).join(' ') name = _.filter([@get('firstName'), @get('lastName')]).join(' ')
return name if name return name if name
name = @get('name')
return name if name
[emailName, emailDomain] = @get('email').split('@') [emailName, emailDomain] = @get('email').split('@')
return emailName if emailName return emailName if emailName
return 'Anonymous' return 'Anonymous'

2
server/routes/contact.coffee
View file

@ -14,7 +14,7 @@ module.exports.setup = (app) ->
# log.info "Sending mail from #{req.body.email} saying #{req.body.message}" # log.info "Sending mail from #{req.body.email} saying #{req.body.message}"
fromAddress = req.body.sender or req.body.email or req.user.get('email') fromAddress = req.body.sender or req.body.email or req.user.get('email')
createMailContent req, fromAddress, (subject, content) -> createMailContent req, fromAddress, (subject, content) ->
if req.body.licensesNeeded or req.user.isTeacher() if (req.body.licensesNeeded or req.user.isTeacher()) and subject.indexOf('Level Load Error:') < 0
closeIO.getSalesContactEmail fromAddress, (err, salesContactEmail, userID, leadID) -> closeIO.getSalesContactEmail fromAddress, (err, salesContactEmail, userID, leadID) ->
return log.error("Error getting sales contact for #{fromAddress}: #{err.message or err}") if err return log.error("Error getting sales contact for #{fromAddress}: #{err.message or err}") if err
closeIO.sendMail fromAddress, subject, content, salesContactEmail, leadID, (err) -> closeIO.sendMail fromAddress, subject, content, salesContactEmail, leadID, (err) ->