From c35d9a3967b17026a894db5533a142b66b9a41f8 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 12 Mar 2015 09:08:29 +0100
Subject: [PATCH] fix first item index

---
 telemeta/{models => }/search_indexes.py                |  4 +++-
 .../search/indexes/telemeta/mediacollection_text.txt   |  2 ++
 .../search/indexes/telemeta/mediaitem_text.txt         |  2 ++
 telemeta/templates/search/search.html                  | 10 ++++++++--
 telemeta/urls.py                                       |  2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)
 rename telemeta/{models => }/search_indexes.py (73%)
 create mode 100644 telemeta/templates/search/indexes/telemeta/mediacollection_text.txt
 create mode 100644 telemeta/templates/search/indexes/telemeta/mediaitem_text.txt

diff --git a/telemeta/models/search_indexes.py b/telemeta/search_indexes.py
similarity index 73%
rename from telemeta/models/search_indexes.py
rename to telemeta/search_indexes.py
index cbd4bb2d..ff34d4a3 100644
--- a/telemeta/models/search_indexes.py
+++ b/telemeta/search_indexes.py
@@ -4,7 +4,9 @@ from telemeta.models import *
 
 class MediaItemIndex(indexes.SearchIndex, indexes.Indexable):
 
-    title = indexes.CharField(use_template=True, document=True)
+    text = indexes.CharField(document=True)
 
     def get_model(self):
         return MediaItem
+
+
diff --git a/telemeta/templates/search/indexes/telemeta/mediacollection_text.txt b/telemeta/templates/search/indexes/telemeta/mediacollection_text.txt
new file mode 100644
index 00000000..4665cb55
--- /dev/null
+++ b/telemeta/templates/search/indexes/telemeta/mediacollection_text.txt
@@ -0,0 +1,2 @@
+{{ object.title }}
+{{ object.body }}
diff --git a/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt b/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt
new file mode 100644
index 00000000..4665cb55
--- /dev/null
+++ b/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt
@@ -0,0 +1,2 @@
+{{ object.title }}
+{{ object.body }}
diff --git a/telemeta/templates/search/search.html b/telemeta/templates/search/search.html
index e3f6dd4d..64cbb476 100644
--- a/telemeta/templates/search/search.html
+++ b/telemeta/templates/search/search.html
@@ -1,7 +1,13 @@
 {% extends 'telemeta/base.html' %}
+{% load telemeta_utils %}
+{% load i18n %}
+
+
+{% block title %}
+{% trans "Search" %}
+{% endblock %}
 
 {% block content %}
-    <h2>Search</h2>
 
     <form method="get" action=".">
         <table>
@@ -9,7 +15,7 @@
             <tr>
                 <td>&nbsp;</td>
                 <td>
-                    <input type="submit" value="Search">
+                    <input type="submit" value="{% trans "Search" %}">
                 </td>
             </tr>
         </table>
diff --git a/telemeta/urls.py b/telemeta/urls.py
index cac3461a..1be5f404 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -142,7 +142,7 @@ urlpatterns = patterns('',
     url(r'^search/(?P<type>[A-Za-z0-9._-]+)/$', SearchView.as_view(), name="telemeta-search-type"),
     url(r'^search_criteria/$', home_view.edit_search, name="telemeta-search-criteria"),
     url(r'^complete_location/$', home_view.complete_location, name="telemeta-complete-location"),
-    url(r'^search_haystack/', include('haystack.urls')),
+    url(r'^haystack/', include('haystack.urls')),
 
     # administration
     url(r'^admin/$', admin_view.admin_index, name="telemeta-admin"),
-- 
2.39.5