Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
This commit is contained in:
@ -40,7 +40,7 @@ exports.returnNextCourseware = function(req, res, next) {
|
|||||||
});
|
});
|
||||||
req.user.save();
|
req.user.save();
|
||||||
|
|
||||||
var uncompletedCoursewares = req.user.uncompletedCoursewares.shift();
|
var uncompletedCoursewares = req.user.uncompletedCoursewares[0];
|
||||||
|
|
||||||
|
|
||||||
var displayedCoursewares = Courseware.find({'_id': uncompletedCoursewares});
|
var displayedCoursewares = Courseware.find({'_id': uncompletedCoursewares});
|
||||||
@ -256,7 +256,7 @@ exports.completedCourseware = function (req, res, next) {
|
|||||||
githubLink: null,
|
githubLink: null,
|
||||||
verified: true
|
verified: true
|
||||||
});
|
});
|
||||||
var index = req.user.completedCoursewares.indexOf(coursewareHash);
|
var index = req.user.uncompletedCoursewares.indexOf(coursewareHash);
|
||||||
|
|
||||||
if (index > -1) {
|
if (index > -1) {
|
||||||
req.user.progressTimestamps.push(Date.now() || 0);
|
req.user.progressTimestamps.push(Date.now() || 0);
|
||||||
|
Reference in New Issue
Block a user