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

hotfixes for field guide

Browse Source
This commit is contained in:
Quincy Larson
2015-05-09 23:40:28 -07:00
parent 10c4cec293
commit 1033d74ccb
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
controllers/fieldGuide.js
View File

@ -9,15 +9,17 @@ exports.returnIndividualFieldGuide = function(req, res, next) {
var fieldGuideName = dashedName.replace(/\-/g, ' ');
var completed = req.user.completedFieldGuides;
if (req.user) {
var completed = req.user.completedFieldGuides;
var uncompletedFieldGuides = resources.allFieldGuideIds().filter(function (elem) {
if (completed.indexOf(elem) === -1) {
return elem;
}
});
req.user.uncompletedFieldGuides = uncompletedFieldGuides;
req.user.save();
var uncompletedFieldGuides = resources.allFieldGuideIds().filter(function (elem) {
if (completed.indexOf(elem) === -1) {
return elem;
}
});
req.user.uncompletedFieldGuides = uncompletedFieldGuides;
req.user.save();
}
FieldGuide.find({'name': new RegExp(fieldGuideName, 'i')}, function(err, fieldGuideFromMongo) {
if (err) {
@ -59,7 +61,7 @@ exports.showAllFieldGuides = function(req, res) {
exports.returnNextFieldGuide = function(req, res, next) {
if (!req.user) {
return res.redirect('../field-guide/how-do-i-use-this-guide?');
return res.redirect('/field-guide/how-do-i-use-this-guide?');
}
var displayedFieldGuides = FieldGuide.find({'_id': req.user.uncompletedFieldGuides[0]});

3
views/partials/field-guide.jade
View File

@ -30,9 +30,10 @@ h3
} else {
$(div).html("<div class='row'>" +
"<div class='hidden-xs col-sm-3 col-md-2'></div>" +
"<div class='col-xs-12 col-sm-9 col-md-10'>" +
"<div class='col-xs-12 col-sm-6 col-md-8'>" +
"<li><a href='/field-guide/" + linkedName + "'>" + data.fieldGuideList[i].name + "</a></li>" +
"</div>" +
"<div class='col-sm-3 col-md-2'></div>" +
"</div>" +
"</div>");
}