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