From: Kaltar5679 <killian.mary@outlook.fr>
Date: Thu, 23 Apr 2015 14:25:48 +0000 (+0200)
Subject: Adding src/ for docker
X-Git-Tag: 1.6a^2~15^2~86
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4f22796c58c550326f736eff070681a76886735b;p=telemeta.git

Adding src/ for docker
modif for advance search
---

diff --git a/src/django-haystack b/src/django-haystack
new file mode 160000
index 00000000..97475f28
--- /dev/null
+++ b/src/django-haystack
@@ -0,0 +1 @@
+Subproject commit 97475f2813a36e402296d5f2389fe10cd4cd1e0b
diff --git a/telemeta/search_indexes.py b/telemeta/search_indexes.py
index 9738d552..ae7e95bf 100644
--- a/telemeta/search_indexes.py
+++ b/telemeta/search_indexes.py
@@ -4,8 +4,9 @@ from telemeta.models import *
 
 class MediaItemIndex(indexes.SearchIndex, indexes.Indexable):
 
-    text = indexes.NgramField(document=True, use_template=True)
-    #rec_date = indexes.DateTimeField(use_template=True, null=True)
+    text = indexes.CharField(document=True, use_template=True)
+    item_acces = indexes.CharField(model_attr= 'collection__public_access' , faceted=True)
+    item_status = indexes.CharField(model_attr= 'collection__document_status' , faceted=True)
 
     def get_model(self):
         return MediaItem
diff --git a/telemeta/views/haystack_search.py b/telemeta/views/haystack_search.py
index eda86b2d..75892281 100644
--- a/telemeta/views/haystack_search.py
+++ b/telemeta/views/haystack_search.py
@@ -30,3 +30,8 @@ class HaystackSearch(SearchView):
             extra['type']='item'
         return extra
 
+
+class HaystackAdvanceSearch(SearchView):
+
+    def get_query(self):
+        return super(HaystackAdvanceSearch, self).get_query()