Stopped characters with poor names from having failed URL's

ThaumRystra · Jul 13, 2017 · ac23afa · ac23afa
1 parent a411fb2
commit ac23afa
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/rpg-docs/Model/Character/Characters.js b/rpg-docs/Model/Character/Characters.js
@@ -4,7 +4,7 @@ Characters = new Mongo.Collection("characters");
 Schemas.Character = new SimpleSchema({
 	//strings
 	name:         {type: String, defaultValue: "", trim: false, optional: true},
-	urlName:      {type: String, defaultValue: "", trim: false, optional: true},
+	urlName:      {type: String, defaultValue: "-", trim: false, optional: true},
 	alignment:    {type: String, defaultValue: "", trim: false, optional: true},
 	gender:       {type: String, defaultValue: "", trim: false, optional: true},
 	race:         {type: String, defaultValue: "", trim: false, optional: true},
@@ -547,6 +547,9 @@ if (Meteor.isServer){
 			Characters.update(doc._id, {$set: {urlName}});
 		}
 	});
+	Characters.before.insert(function(userId, doc) {
+		doc.urlName = getSlug(doc.name, {maintainCase: true}) || "-";
+	});
 }
 
 Characters.allow({

diff --git a/rpg-docs/Routes/Routes.js b/rpg-docs/Routes/Routes.js
@@ -43,7 +43,7 @@ Router.map(function() {
 			var _id = this.params._id
 			var character = Characters.findOne(_id);
 			var urlName = character && character.urlName;
-			var path = `\/character\/${_id}\/${urlName}`;
+			var path = `\/character\/${_id}\/${urlName || "-"}`;
 			Router.go(path,{},{replaceState:true});
 		},
 	});

diff --git a/rpg-docs/client/globalHelpers/characterPath.js b/rpg-docs/client/globalHelpers/characterPath.js
@@ -0,0 +1,3 @@
+Template.registerHelper("characterPath", function(char) {
+	return `\/character\/${char._id}\/${char.urlName || "-"}`;
+});
diff --git a/rpg-docs/client/views/characterList/characterList.html b/rpg-docs/client/views/characterList/characterList.html
@@ -11,7 +11,7 @@
 					{{#if characters.count}}
 						<div class="character-list layout horizontal wrap">
 							{{# each characters}}
-								<a class="character-card flex layout vertical end-justified" href="{{pathFor route="characterSheet" data=this}}">
+								<a class="character-card flex layout vertical end-justified" href="{{characterPath this}}">
 									<iron-image class="fit {{colorClass}}"
 												sizing="cover" preload fade src={{picture}}>
 									</iron-image>

diff --git a/rpg-docs/client/views/characterList/characterSideList.html b/rpg-docs/client/views/characterList/characterSideList.html
@@ -2,7 +2,7 @@
 	{{#if characters.count}}
 		<div class="side-list">
 			{{#each characters}}
-				<a href={{pathFor route="characterSheet" data=this}} tabindex="-1" class="side-list-character characterRepresentative">
+				<a href={{characterPath this}} tabindex="-1" class="side-list-character characterRepresentative">
 					<paper-item class="short">
 						<div class="character-name">
 							{{name}}