gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'jameskopacz-patch-261' of https://github.com/jameskopacz/freecodecamp into jameskopacz-jameskopacz-patch-261

Browse Source 
Conflicts:
	controllers/courseware.js
This commit is contained in:
Berkeley Martinez
2015-03-31 13:43:58 -07:00
parent b6dc82805d c17ff59aef
commit e04470872e
5 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/challenges.js
View File

@@ -27,7 +27,7 @@ exports.returnNextChallenge = function(req, res) {
}
};
exports.returnChallenge = function(req, res) {
exports.returnChallenge = function(req, res, next) {
var challengeNumber = parseInt(req.params.challengeNumber) || 0;
if (challengeNumber === 2) {
req.user.challengesHash[challengeNumber] = Math.round(+new Date() / 1000);
@@ -55,7 +55,7 @@ exports.returnChallenge = function(req, res) {
Challenge.find({}, null, { sort: { challengeNumber: 1 } }, function(err, c) {
if (err) {
debug('Challenge err: ', err);
next(err);
return next(err);
}
res.render('challenges/show', {
title: 'Challenge: ' + c[challengeNumber].name,