Use titles for autocompletion, bump mezzanine version to 4.2

diff --git a/app/organization/magazine/views.py b/app/organization/magazine/views.py
index a5763f85935d1194329b68416fb150cf3f491090..945d4f644de7da8197c74679772540e4ad879bae 100644 (file)
--- a/app/organization/magazine/views.py
+++ b/app/organization/magazine/views.py
@@ -96,14 +96,14 @@ class ObjectAutocomplete(Select2QuerySetSequenceView):
 
         if self.q:
             #qs = qs.filter(name__istartswith=self.q)
-            articles = articles.filter(name__icontains=self.q)
-            topics = topics.filter(name__icontains=self.q)
+            articles = articles.filter(title__icontains=self.q)
+            topics = topics.filter(title__icontains=self.q)
 
         qs = autocomplete.QuerySetSequence(articles, topics)
 
         if self.q:
             # This would apply the filter on all the querysets
-            qs = qs.filter(name__icontains=self.q)
+            qs = qs.filter(title__icontains=self.q)
 
         # This will limit each queryset so that they show an equal number
         # of results.

diff --git a/requirements-dev.txt b/requirements-dev.txt
index ace5a184559b313d61b63f7cb02d0c5ba3ec034e..bc7ae6d60c2e23c8d3794da2e25a8cc8131607f5 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,5 @@
 -e git+https://github.com/yomguy/mezzanine-agenda.git#egg=mezzanine-agenda-0.2.2
--e git+https://github.com/stephenmcd/mezzanine.git@master#egg=mezzanine-4.1-master
+#-e git+https://github.com/stephenmcd/mezzanine.git@master#egg=mezzanine-4.2.master
 -e git+https://github.com/stephenmcd/grappelli-safe.git@dynamic_stacked#egg=grappelli-safe-0.4.2
--e git+https://github.com/yourlabs/django-autocomplete-light.git#egg=django-autocomplete-light
+#-e git+https://github.com/yourlabs/django-autocomplete-light.git#egg=django-autocomplete-light
 #https://forge.ircam.fr/p/django-eve/source/download/dev/

diff --git a/requirements.txt b/requirements.txt
index 080247cda17ed84719479dcaa798c5a47a9d60c6..bff2131627ce6168956c137ca449663b7b4e1536 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ mysqlclient
 psycopg2
 pyquery
 Django==1.9.7
-mezzanine==4.1.0
+mezzanine==4.2.0
 django-modeltranslation
 django-meta
 django-bower