From 1fca5898054f7714d1395e8f30780c41cac4de83 Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Sun, 31 May 2015 18:44:43 -0400 Subject: [PATCH 1/3] Update story cleanup script --- seed_data/storyCleanup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed_data/storyCleanup.js b/seed_data/storyCleanup.js index c216e67293..2598526c8a 100644 --- a/seed_data/storyCleanup.js +++ b/seed_data/storyCleanup.js @@ -18,8 +18,8 @@ function storyLinkCleanup(cb) { console.log(i++); this.pause(); story.storyLink = story.storyLink. - replace(/\s+/g, ' '). replace(/[^a-z0-9\s]/gi, ''). + replace(/\s+/g, ' '). toLowerCase(). trim(); story.save(function (err) { From 85e907478d221d3725edb4c99e1fddfbed120309 Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Sun, 31 May 2015 18:45:51 -0400 Subject: [PATCH 2/3] Remove debug --- controllers/story.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/controllers/story.js b/controllers/story.js index 4911409861..a828f70d05 100755 --- a/controllers/story.js +++ b/controllers/story.js @@ -346,8 +346,6 @@ exports.storySubmission = function(req, res, next) { // if duplicate storyLink add unique number storyLink = (storyCount === 0) ? storyLink : storyLink + ' ' + storyCount; - debug(storyLink); - var link = data.link; if (link.search(/^https?:\/\//g) === -1) { link = 'http://' + link; From 73de78bbada5508fef6d9edfab4cf8a211e31dc3 Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Sun, 31 May 2015 19:10:19 -0400 Subject: [PATCH 3/3] Fix dasherization issues for field guides. --- controllers/fieldGuide.js | 17 +++++++---------- controllers/resources.js | 5 ++++- views/field-guide/all-articles.jade | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/controllers/fieldGuide.js b/controllers/fieldGuide.js index 2d0809b6a3..5bbd7235b9 100644 --- a/controllers/fieldGuide.js +++ b/controllers/fieldGuide.js @@ -1,12 +1,10 @@ var R = require('ramda'), FieldGuide = require('./../models/FieldGuide'), - resources = require('./resources'); + resources = require('./resources'), + debug = require('debug')('freecc:fieldguides'); exports.returnIndividualFieldGuide = function(req, res, next) { var dashedName = req.params.fieldGuideName; - - var fieldGuideName = dashedName.replace(/\-/g, ' '); - if (req.user) { var completed = req.user.completedFieldGuides; @@ -22,7 +20,7 @@ exports.returnIndividualFieldGuide = function(req, res, next) { } FieldGuide.find( - { name: new RegExp(fieldGuideName, 'i') }, + { dashedName: new RegExp(dashedName, 'i') }, function(err, fieldGuideFromMongo) { if (err) { return next(err); @@ -38,11 +36,10 @@ exports.returnIndividualFieldGuide = function(req, res, next) { } var fieldGuide = R.head(fieldGuideFromMongo); - var dashedNameFull = fieldGuide.name.toLowerCase().replace(/\s/g, '-').replace(/\?/g, ''); - if (dashedNameFull !== dashedName) { - return res.redirect('../field-guide/' + dashedNameFull); + if (fieldGuide.dashedName !== dashedName) { + return res.redirect('../field-guide/' + fieldGuide.dashedName); } res.render('field-guide/show', { title: fieldGuide.name, @@ -68,7 +65,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 = @@ -89,7 +86,7 @@ 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, '-'); return res.redirect('../field-guide/' + nameString); diff --git a/controllers/resources.js b/controllers/resources.js index eabb05f87f..e80473d109 100644 --- a/controllers/resources.js +++ b/controllers/resources.js @@ -454,7 +454,10 @@ module.exports = { return allFieldGuideNames; } else { allFieldGuideNames = fieldGuides.map(function (elem) { - return { name: elem.name, id: elem._id }; + return { + name: elem.name, + dashedName: elem.dashedName, + id: elem._id }; }); return allFieldGuideNames; } diff --git a/views/field-guide/all-articles.jade b/views/field-guide/all-articles.jade index 80bc2f9091..c79d8aaa8f 100644 --- a/views/field-guide/all-articles.jade +++ b/views/field-guide/all-articles.jade @@ -14,11 +14,11 @@ block content .hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center .col-xs-12.col-sm-9.col-md-10 li.faded - a(href="/field-guide/#{fieldGuide.name}")= fieldGuide.name + a(href="/field-guide/#{fieldGuide.dashedName}")= fieldGuide.name else .row .hidden-xs.col-sm-3.col-md-2 span .col-xs-12.col-sm-9.col-md-10 li - a(href="/field-guide/#{fieldGuide.name}")= fieldGuide.name + a(href="/field-guide/#{fieldGuide.dashedName}")= fieldGuide.name