hotfixes for field guide
This commit is contained in:
@ -9,6 +9,7 @@ exports.returnIndividualFieldGuide = function(req, res, next) {
|
|||||||
|
|
||||||
var fieldGuideName = dashedName.replace(/\-/g, ' ');
|
var fieldGuideName = dashedName.replace(/\-/g, ' ');
|
||||||
|
|
||||||
|
if (req.user) {
|
||||||
var completed = req.user.completedFieldGuides;
|
var completed = req.user.completedFieldGuides;
|
||||||
|
|
||||||
var uncompletedFieldGuides = resources.allFieldGuideIds().filter(function (elem) {
|
var uncompletedFieldGuides = resources.allFieldGuideIds().filter(function (elem) {
|
||||||
@ -18,6 +19,7 @@ exports.returnIndividualFieldGuide = function(req, res, next) {
|
|||||||
});
|
});
|
||||||
req.user.uncompletedFieldGuides = uncompletedFieldGuides;
|
req.user.uncompletedFieldGuides = uncompletedFieldGuides;
|
||||||
req.user.save();
|
req.user.save();
|
||||||
|
}
|
||||||
|
|
||||||
FieldGuide.find({'name': new RegExp(fieldGuideName, 'i')}, function(err, fieldGuideFromMongo) {
|
FieldGuide.find({'name': new RegExp(fieldGuideName, 'i')}, function(err, fieldGuideFromMongo) {
|
||||||
if (err) {
|
if (err) {
|
||||||
@ -59,7 +61,7 @@ exports.showAllFieldGuides = function(req, res) {
|
|||||||
|
|
||||||
exports.returnNextFieldGuide = function(req, res, next) {
|
exports.returnNextFieldGuide = function(req, res, next) {
|
||||||
if (!req.user) {
|
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]});
|
var displayedFieldGuides = FieldGuide.find({'_id': req.user.uncompletedFieldGuides[0]});
|
||||||
|
@ -30,9 +30,10 @@ h3
|
|||||||
} else {
|
} else {
|
||||||
$(div).html("<div class='row'>" +
|
$(div).html("<div class='row'>" +
|
||||||
"<div class='hidden-xs col-sm-3 col-md-2'></div>" +
|
"<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>" +
|
"<li><a href='/field-guide/" + linkedName + "'>" + data.fieldGuideList[i].name + "</a></li>" +
|
||||||
"</div>" +
|
"</div>" +
|
||||||
|
"<div class='col-sm-3 col-md-2'></div>" +
|
||||||
"</div>" +
|
"</div>" +
|
||||||
"</div>");
|
"</div>");
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user