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

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-12-15 10:05:41 -08:00
commit 60076d09c1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/commons/Handler.coffee
View file

@ -23,7 +23,7 @@ module.exports = class Handler
allowedMethods: ['GET', 'POST', 'PUT', 'PATCH'] allowedMethods: ['GET', 'POST', 'PUT', 'PATCH']
constructor: -> constructor: ->
# TODO The second 'or' is for backward compatibility only is for backward compatibility only # TODO The second 'or' is for backward compatibility only
@privateProperties = @modelClass?.privateProperties or @privateProperties or [] @privateProperties = @modelClass?.privateProperties or @privateProperties or []
@editableProperties = @modelClass?.editableProperties or @editableProperties or [] @editableProperties = @modelClass?.editableProperties or @editableProperties or []
@postEditableProperties = @modelClass?.postEditableProperties or @postEditableProperties or [] @postEditableProperties = @modelClass?.postEditableProperties or @postEditableProperties or []

2
server/routes/db.coffee
View file

@ -7,7 +7,7 @@ hipchat = require '../hipchat'
module.exports.setup = (app) -> module.exports.setup = (app) ->
# This is hacky and should probably get moved somewhere else, I dunno # This is hacky and should probably get moved somewhere else, I dunno
app.get '/db/cla.submissions', (req, res) -> app.get '/db/cla.submissions', (req, res) ->
return errors.unauthorized(res, 'You must be an admin to view that information') unless req.user?.isAdmin() or ('github' in req.user?.permissions ? []) return errors.unauthorized(res, 'You must be an admin to view that information') unless req.user?.isAdmin() or ('github' in (req.user?.get('permissions') ? []))
res.setHeader('Content-Type', 'application/json') res.setHeader('Content-Type', 'application/json')
collection = mongoose.connection.db.collection 'cla.submissions', (err, collection) -> collection = mongoose.connection.db.collection 'cla.submissions', (err, collection) ->
return log.error "Couldn't fetch CLA submissions because #{err}" if err return log.error "Couldn't fetch CLA submissions because #{err}" if err