From 73de78bbada5508fef6d9edfab4cf8a211e31dc3 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Sun, 31 May 2015 19:10:19 -0400
Subject: [PATCH] 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