replaced ' with \' in names of models and projects closes #559 and cl…

…oses #570
sandialabs · Feb 1, 2016 · 9590159 · 9590159
1 parent c0712b6
commit 9590159
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/packages/slycat/web/server/handlers.py b/packages/slycat/web/server/handlers.py
@@ -203,6 +203,7 @@ def get_project(pid):
     context["slycat-css-bundle"] = css_bundle()
     context["slycat-js-bundle"] = js_bundle()
     context["slycat-project"] = project
+    context["slycat-project-name"] = project.get("name", "").replace("'", "\\'")
     return slycat.web.server.template.render("slycat-project.html", context)
 
 def get_remote_host_dict():
@@ -435,8 +436,13 @@ def get_model(mid, **kwargs):
     context["slycat-server-root"] = cherrypy.request.app.config["slycat-web-server"]["server-root"]
     context["slycat-marking-before-html"] = marking["badge"] if marking["page-before"] is None else marking["page-before"]
     context["slycat-marking-after-html"] = marking["badge"] if marking["page-after"] is None else marking["page-after"]
+
     context["slycat-model"] = model
+    context["slycat-model-name"] = model.get("name","").replace("'", "\\'")
+
     context["slycat-project"] = project
+    context["slycat-project-name"] = project.get("name", "").replace("'", "\\'")
+
     context["slycat-css-bundle"] = css_bundle()
     context["slycat-js-bundle"] = js_bundle()
     context["slycat-model-type"] = mtype

diff --git a/web-server/templates/slycat-model-page.html b/web-server/templates/slycat-model-page.html
@@ -22,7 +22,7 @@
   </head>
 
   <body>
-    <slycat-navbar params="project_id:'{{slycat-project._id}}', project_name:'{{slycat-project.name}}', model_id:'{{slycat-model._id}}', model_name:'{{slycat-model.name}}', model_marking:'{{slycat-model.marking}}', model_type:'{{slycat-model.model-type}}'"></slycat-navbar>
+    <slycat-navbar params="project_id:'{{slycat-project._id}}', project_name:'{{slycat-project-name}}', model_id:'{{slycat-model._id}}', model_name:'{{slycat-model-name}}', model_marking:'{{slycat-model.marking}}', model_type:'{{slycat-model.model-type}}'"></slycat-navbar>
     <div class="slycat-content">
       {{{slycat-marking-before-html}}}
       {{{slycat-page-html}}}

diff --git a/web-server/templates/slycat-project.html b/web-server/templates/slycat-project.html
@@ -16,7 +16,7 @@
   </head>
 
   <body>
-    <slycat-navbar params="project_id:'{{slycat-project._id}}', project_name:'{{slycat-project.name}}'"></slycat-navbar>
+    <slycat-navbar params="project_id:'{{slycat-project._id}}', project_name:'{{slycat-project-name}}'"></slycat-navbar>
 
     <div id="slycat-project" class="bootstrap-styles slycat-content">
       <div class="container">