codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-05-03 17:33:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
Scott Erickson 2014-07-06 09:36:12 -07:00
commit d640dac33a
2 changed files with 5 additions and 9 deletions
app/schemas/models
user.coffee
server/plugins
achievements.coffee

8
app/schemas/models/user.coffee
View file

@ -118,17 +118,13 @@ UserSchema = c.object {},
type: 'string'
location:
title: 'Location'
description: "The CURRENT location of the candidate"
description: 'The CURRENT location of the candidate'
type: 'string'
education:
title: 'Education'
description: 'The main educational institution of the candidate'
type: 'string'
workHistory: c.array
title: 'Work history'
description: 'One or two places the candidate has worked'
type: 'array'
,
workHistory: c.array {title: 'Work history', description: 'One or two places the candidate has worked', type: 'array'},
title: 'Workplace'
type: 'string'
phoneScreenFilter:

4
server/plugins/achievements.coffee
View file

@ -8,7 +8,7 @@ achievements = {}
module.exports = AchievablePlugin = (schema, options) ->
User = require '../users/User' # Avoid mutual inclusion cycles
Achievement = require('../achievements/Achievement')
Achievement = require '../achievements/Achievement'
checkForAchievement = (doc) ->
collectionName = doc.constructor.modelName
@ -85,7 +85,7 @@ module.exports = AchievablePlugin = (schema, options) ->
module.exports.loadAchievements = ->
achievements = {}
Achievement = require('../achievements/Achievement')
Achievement = require '../achievements/Achievement'
query = Achievement.find({})
query.exec (err, docs) ->
_.each docs, (achievement) ->