onny/verwaltungstracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add status filter to search

Browse source
This commit is contained in:
Stefan Wehrmeyer 2022-03-17 14:42:26 +01:00
parent 371353fbbe
commit ca79e88c16
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
froide_govplan/views.py
View file

@ -102,7 +102,10 @@ class GovPlanProposeUpdateView(GovernmentMixin, LoginRequiredMixin, UpdateView):
def search(request): def search(request):
plans = GovernmentPlan.objects.search(request.GET.get("q", "")) q = request.GET.get("q", "")
plans = GovernmentPlan.objects.filter(public=True)
if q:
plans = GovernmentPlan.objects.search(q, qs=plans)
if request.GET.get("government"): if request.GET.get("government"):
try: try:
@ -110,7 +113,15 @@ def search(request):
plans = plans.filter(government_id=gov_id) plans = plans.filter(government_id=gov_id)
except ValueError: except ValueError:
pass pass
if request.GET.get("status"):
try:
status = request.GET["status"]
plans = plans.filter(status=status)
except ValueError:
pass
if q:
# limit when there's a search
plans = plans[:20] plans = plans[:20]
return render( return render(
request, "froide_govplan/plugins/card_cols.html", {"object_list": plans} request, "froide_govplan/plugins/card_cols.html", {"object_list": plans}