Updated to django autocomplete v3

6 files changed, 44 insertions, 10 deletions

diff --git a/app/links/admin.py b/app/links/admin.py
index 1f45f1e..c1c0bdb 100644
--- a/app/links/admin.py
+++ b/app/links/admin.py
@@ -6,7 +6,6 @@ from django.contrib.admin import helpers
 from django.http import HttpResponseRedirect
 
 from utils.widgets import TagListFilter
-import autocomplete_light
 from .models import Link
 from .forms import LinkForm
 
diff --git a/app/links/forms.py b/app/links/forms.py
index ca6205b..80a7c50 100644
--- a/app/links/forms.py
+++ b/app/links/forms.py
@@ -1,10 +1,17 @@
 from django import forms
-import autocomplete_light
-from autocomplete_light.contrib.taggit_field import TaggitField, TaggitWidget
+import dal 
+from dal_select2_taggit.widgets import TaggitSelect2
 from .models import Link 
 
-class LinkForm(forms.ModelForm):
-    tags = TaggitField(widget=TaggitWidget('TagAutocomplete'))
+from dal import autocomplete
+
+
+class LinkForm(autocomplete.FutureModelForm):
     class Meta:
-        fields = '__all__'
-        model = Link
+        model = Link 
+        fields = ('tags',)
+        widgets = {
+            'tags': autocomplete.TaggitSelect2(
+                'tag-autocomplete'
+            )
+        }
diff --git a/app/links/views.py b/app/links/views.py
index 36ccca3..b00d32c 100644
--- a/app/links/views.py
+++ b/app/links/views.py
@@ -4,7 +4,6 @@ from utils.views import PaginatedListView
 from .models import Link
 from taggit.models import Tag
 
-
 class LinkListView(PaginatedListView):
     model = Link
     template_name = 'archives/links.html'
diff --git a/app/utils/views.py b/app/utils/views.py
index c5f3f59..fe0db4b 100644
--- a/app/utils/views.py
+++ b/app/utils/views.py
@@ -35,3 +35,20 @@ def insert_image(request):
     )
     return render_to_response('admin/insert_images.html', {'object_list': object_list, 'textarea_id': request.GET['textarea']}, context_instance=RequestContext(request))
     
+
+from taggit.models import Tag
+
+from dal import autocomplete
+
+class TagAutocomplete(autocomplete.Select2QuerySetView):
+    def get_queryset(self):
+        # Don't forget to filter out results depending on the visitor !
+        if not self.request.user.is_authenticated():
+            return Tag.objects.none()
+
+        qs = Tag.objects.all()
+
+        if self.q:
+            qs = qs.filter(name__istartswith=self.q)
+
+        return qs
diff --git a/config/base_urls.py b/config/base_urls.py
index 693ec26..88ddfdb 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -45,8 +45,15 @@ urlpatterns = [
     url(r'^media/(?P<path>.*)$', static.serve, {'document_root': settings.MEDIA_ROOT}),
 ]
 
+
+from utils.views import TagAutocomplete
+
 urlpatterns += [
-    url(r'^autocomplete/', include('autocomplete_light.urls')),
+    url(
+        r'^tag-autocomplete/$',
+        TagAutocomplete.as_view(),
+        name='tag-autocomplete',
+    ),
     url(r'^admin/build/.*', builder.views.do_build),
     url(r'^admin/', include(admin.site.urls),),
     url(r'^luximages/insert/', utils.views.insert_image),
@@ -88,3 +95,9 @@ urlpatterns += [
         {'document_root': settings.STATIC_ROOT, }
     ),
 ]
+
+if settings.DEBUG:
+    import debug_toolbar
+    urlpatterns = [
+        url(r'^__debug__/', include(debug_toolbar.urls)),
+    ] + urlpatterns
diff --git a/design/templates/admin/base.html b/design/templates/admin/base.html
index 0af7cc7..080a3a4 100644
--- a/design/templates/admin/base.html
+++ b/design/templates/admin/base.html
@@ -10,7 +10,6 @@
 <script type="text/javascript">window.__admin_media_prefix__ = "{% filter escapejs %}{% static "admin/" %}{% endfilter %}";</script>
 {% block extrahead %}{% endblock %}
 {% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
-{% include 'autocomplete_light/static.html' %}
 </head>
 {% load i18n %}