From ca79e88c16158a50e8921954c665ff2f57d4571b Mon Sep 17 00:00:00 2001 From: Stefan Wehrmeyer Date: Thu, 17 Mar 2022 14:42:26 +0100 Subject: [PATCH] Add status filter to search --- froide_govplan/views.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/froide_govplan/views.py b/froide_govplan/views.py index ee63db3..cd9d581 100644 --- a/froide_govplan/views.py +++ b/froide_govplan/views.py @@ -102,7 +102,10 @@ class GovPlanProposeUpdateView(GovernmentMixin, LoginRequiredMixin, UpdateView): 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"): try: @@ -110,8 +113,16 @@ def search(request): plans = plans.filter(government_id=gov_id) except ValueError: pass + if request.GET.get("status"): + try: + status = request.GET["status"] + plans = plans.filter(status=status) + except ValueError: + pass - plans = plans[:20] + if q: + # limit when there's a search + plans = plans[:20] return render( request, "froide_govplan/plugins/card_cols.html", {"object_list": plans} )