From 546c0b971f98ca5e9a75ab0816b2928adbd4ca23 Mon Sep 17 00:00:00 2001
From: jpic <jamespic@gmail.com>
Date: Thu, 11 Feb 2016 21:09:40 +0100
Subject: [PATCH] Added dossier autocomplete view
---
representatives_votes/autocompletes.py | 15 ++++++++++++++-
representatives_votes/urls.py | 14 +++++++++++---
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/representatives_votes/autocompletes.py b/representatives_votes/autocompletes.py
index ee1e817..d293849 100644
--- a/representatives_votes/autocompletes.py
+++ b/representatives_votes/autocompletes.py
@@ -2,7 +2,20 @@ from dal import autocomplete
from django.db.models import Q
-from models import Proposal
+from models import Dossier, Proposal
+
+
+class DossierAutocomplete(autocomplete.Select2QuerySetView):
+ def get_queryset(self):
+ qs = Dossier.objects.all()
+
+ if self.q:
+ qs = qs.filter(
+ Q(title__icontains=self.q) |
+ Q(reference__icontains=self.q)
+ )
+
+ return qs
class ProposalAutocomplete(autocomplete.Select2QuerySetView):
diff --git a/representatives_votes/urls.py b/representatives_votes/urls.py
index e6e2b74..6f92843 100644
--- a/representatives_votes/urls.py
+++ b/representatives_votes/urls.py
@@ -17,12 +17,20 @@ urlpatterns = [
]
if 'dal_select2' in settings.INSTALLED_APPS:
- from autocompletes import ProposalAutocomplete # noqa
+ from autocompletes import ( # noqa
+ DossierAutocomplete,
+ ProposalAutocomplete,
+ )
- urlpatterns.append(
+ urlpatterns += [
+ url(
+ '^autocomplete/dossier/$',
+ DossierAutocomplete.as_view(),
+ name='dossier-autocomplete',
+ ),
url(
'autocomplete/proposal/$',
ProposalAutocomplete.as_view(),
name='proposal-autocomplete',
),
- )
+ ]
--
GitLab