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

resolve merge conflict, favoring upstream

Browse Source
This commit is contained in:
Nathan Leniz
2015-03-28 17:41:07 +09:00
parent 0a07c1e397 4d3337df32
commit ff94d10aa8
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/courseware.js
View File

@ -259,14 +259,18 @@ exports.completedCourseware = function (req, res, next) {
req.user.uncompletedCoursewares.splice(index, 1);
}
req.user.save(function (err, user, next) {
if (err) {
return next(err);
exports.completedBasejump = function (req, res, next) {
var isCompletedWith = req.body.bonfireInfo.completedWith || undefined;
var isCompletedDate = Math.round(+new Date());
var coursewareHash = req.body.coursewareInfo.coursewareHash;
var solutionLink = req.body.coursewareInfo.solutionLink;
if(!solutionLink) {
// flash error and redirect
}
if (user) {
res.send(true);
}
});
};
};
exports.completedZiplineOrBasejump = function (req, res, next) {