Merge branch 'develop' into feature/webapp-tests

This commit is contained in:
Aarni Halinen
2019-11-10 21:38:07 +02:00
5 changed files with 31 additions and 24 deletions
+4 -3
View File
@@ -55,9 +55,10 @@ class SignupFormViewSet(viewsets.ModelViewSet):
queryset = SignupForm.objects.all()
serializer_class = SignupFormSerializer
permission_classes = [IsAuthenticatedOrReadOnly]
filter_backends = (filters.DjangoFilterBackend, SearchFilter, OrderingFilter)
filter_fields = '__all__'
search_fields = '__all__'
# Throws errors with JSONFIeld. Modify __all__ to not use JSONField if filters are enadbled
# filter_backends = (filters.DjangoFilterBackend, SearchFilter, OrderingFilter)
# filter_fields = '__all__'
# search_fields = '__all__'
def get_queryset(self):
return SignupForm.objects.filter(visible=True, end_time__gt=timezone.now()).order_by('start_time')