Skip to content
Snippets Groups Projects
Commit ac4f563c authored by Parbhat Puri's avatar Parbhat Puri Committed by Fredrik Jonsson
Browse files

Submit date filter and fix active filter to include all positional parameters

parent c95e6dbd
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment