From 1033d74ccbd4a16db141727c198d3c38aa4bc25e Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 9 May 2015 23:40:28 -0700 Subject: [PATCH] hotfixes for field guide --- controllers/fieldGuide.js | 20 +++++++++++--------- views/partials/field-guide.jade | 3 ++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/controllers/fieldGuide.js b/controllers/fieldGuide.js index a7d00fc97b..f8e35a47de 100644 --- a/controllers/fieldGuide.js +++ b/controllers/fieldGuide.js @@ -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]}); diff --git a/views/partials/field-guide.jade b/views/partials/field-guide.jade index 5c08d39896..e4d70b01d1 100644 --- a/views/partials/field-guide.jade +++ b/views/partials/field-guide.jade @@ -30,9 +30,10 @@ h3 } else { $(div).html("
" + "" + - "
" + + "" + + "
" + "
" + "
"); }