Fixes 404 error caused when searching blog/news content

DataViva · Jan 9, 2017 · cb2ff9b · cb2ff9b
1 parent 037c639
commit cb2ff9b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/dataviva/apps/blog/templates/blog/_base.html b/dataviva/apps/blog/templates/blog/_base.html
@@ -35,7 +35,7 @@ <h3>{% trans %}Topics{% endtrans %}</h3>
                     <h1>Blog</h1>
                 </div>
                 <div class="col-md-offset-4 col-md-5 col-sm-offset-3 col-sm-6 col-xs-8 search-form-wrapper">
-                    <form>
+                    <form id="search-form">
                         <div class="input-group">
                             <input name="search" type="text" class="form-control input-sm" aria-label="..." placeholder="{% trans %}Search{% endtrans %}">
                             <div class="input-group-btn">

diff --git a/dataviva/apps/news/templates/news/_base.html b/dataviva/apps/news/templates/news/_base.html
@@ -35,7 +35,7 @@ <h3>{% trans %}Topics{% endtrans %}</h3>
                     <h1>{% trans %}News{% endtrans %}</h1>
                 </div>
                 <div class="col-md-offset-4 col-md-5 col-sm-offset-3 col-sm-6 col-xs-8 search-form-wrapper">
-                    <form>
+                    <form id="search-form">
                         <div class="input-group">
                             <input name="search" type="text" class="form-control input-sm" aria-label="..." placeholder="{% trans %}Search{% endtrans %}">
                             <div class="input-group-btn">

diff --git a/dataviva/static/js/modules/blog.js b/dataviva/static/js/modules/blog.js
@@ -0,0 +1,6 @@
+$(function() {
+    $('#search-form').submit(function() {
+        window.location.href = '/' + dataviva.language + '/blog/?search=' + $(this).find('input').val().replace(' ', '+');
+        return false;
+    });
+});
diff --git a/dataviva/static/js/modules/news.js b/dataviva/static/js/modules/news.js
@@ -0,0 +1,6 @@
+$(function() {
+    $('#search-form').submit(function() {
+        window.location.href = '/' + dataviva.language + '/news/?search=' + $(this).find('input').val().replace(' ', '+');
+        return false;
+    });
+});
diff --git a/scripts/rebuild_search_indices.py b/scripts/rebuild_search_indices.py
@@ -52,7 +52,6 @@ def rebuild_index(model):
 if __name__ == "__main__":
     if os.path.exists(WHOOSH_BASE):
         rmtree(WHOOSH_BASE)
-    import pdb; pdb.set_trace()
     model_list = [Post, Publication]
     for model in model_list:
         rebuild_index(model)