From ac4f563c0e4543b4ae98900ad25622c5bf9e846f Mon Sep 17 00:00:00 2001
From: Parbhat Puri <parbhatpuri17@gmail.com>
Date: Tue, 25 Jun 2019 08:11:31 +0000
Subject: [PATCH] Submit date filter and fix active filter to include all
positional parameters
---
opentech/apply/funds/api_views.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/opentech/apply/funds/api_views.py b/opentech/apply/funds/api_views.py
index 55ad0c604..f520973d7 100644
--- a/opentech/apply/funds/api_views.py
+++ b/opentech/apply/funds/api_views.py
@@ -40,13 +40,14 @@ class RoundLabFilter(filters.ModelChoiceFilter):
class SubmissionsFilter(filters.FilterSet):
round = RoundLabFilter(queryset=RoundsAndLabs.objects.all())
status = filters.MultipleChoiceFilter(choices=PHASES)
- active = filters.BooleanFilter(method='filter_active')
+ active = filters.BooleanFilter(method='filter_active', label='Active')
+ submit_date = filters.DateFromToRangeFilter(name='submit_time', label='Submit date')
class Meta:
model = ApplicationSubmission
- fields = ('status', 'round', 'active')
+ fields = ('status', 'round', 'active', 'submit_date', )
- def filter_active(self, value):
+ def filter_active(self, qs, name, value):
if value is None:
return qs
--
GitLab