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

revert breaking changes to field guide controller

Browse Source
This commit is contained in:
Quincy Larson
2015-05-26 01:36:37 -07:00
parent cf6232192f
commit 3a41be9e55
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
controllers/fieldGuide.js
View File

@ -5,8 +5,7 @@ var R = require('ramda'),
exports.returnIndividualFieldGuide = function(req, res, next) {
var dashedName = req.params.fieldGuideName;
var fieldGuideName = dashedName.replace(/\-/g, ' ')
.replace(/[^a-z0-9\s]/gi, '');
var fieldGuideName = dashedName.replace(/\-/g, ' ');
if (req.user) {
var completed = req.user.completedFieldGuides;
@ -40,9 +39,7 @@ exports.returnIndividualFieldGuide = function(req, res, next) {
var fieldGuide = R.head(fieldGuideFromMongo);
var dashedNameFull =
fieldGuide.name.toLowerCase()
.replace(/\s/g, '-')
.replace(/[^a-z0-9\-]/gi, '');
fieldGuide.name.toLowerCase().replace(/\s/g, '-').replace(/\?/g, '');
if (dashedNameFull !== dashedName) {
return res.redirect('../field-guide/' + dashedNameFull);
@ -71,7 +68,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 =
@ -92,11 +89,9 @@ exports.returnNextFieldGuide = function(req, res, next) {
].join('')
});
}
return res.redirect('../field-guide/how-do-i-use-this-guide');
return res.redirect('../field-guide/how-do-i-use-this-guide?');
}
var nameString = fieldGuide.name.toLowerCase()
.replace(/\s/g, '-')
.replace(/[^a-z0-9\-]/gi, '');
var nameString = fieldGuide.name.toLowerCase().replace(/\s/g, '-');
return res.redirect('../field-guide/' + nameString);
});
};