Skip to content

Commit

Permalink
fix DRF compatibility (filtering changes)
Browse files Browse the repository at this point in the history
  • Loading branch information
rloomans committed Dec 8, 2016
1 parent 713e59d commit 00f0076
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ dj-database-url==0.4.1
dj-static==0.0.6
django-csp==3.1
django-crispy-forms==1.6.1
django-filter==1.0.1
djangorestframework==3.5.3
django-secure==1.0.1
django-toolbelt==0.0.1
Expand Down
11 changes: 6 additions & 5 deletions teamtemp/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@
import sys
from responses.serializers import *
from rest_framework import viewsets, filters
from django_filters.rest_framework import DjangoFilterBackend


class WordCloudImageViewSet(viewsets.ModelViewSet):
queryset = WordCloudImage.objects.all()
serializer_class = WordCloudImageSerializer
filter_backends = (filters.DjangoFilterBackend, filters.SearchFilter, filters.OrderingFilter,)
filter_backends = (DjangoFilterBackend, filters.SearchFilter, filters.OrderingFilter,)
filter_fields = ('creation_date', 'word_list', 'image_url',)
order_fields = ('creation_date',)
search_fields = ('word_list',)
Expand All @@ -42,23 +43,23 @@ class UserViewSet(viewsets.ModelViewSet):
class TeamTemperatureViewSet(viewsets.ModelViewSet):
queryset = TeamTemperature.objects.all()
serializer_class = TeamTemperatureSerializer
filter_backends = (filters.DjangoFilterBackend, filters.OrderingFilter,)
filter_backends = (DjangoFilterBackend, filters.OrderingFilter,)
filter_fields = ('creator', 'survey_type',)
order_fields = ('creation_date',)


class TemperatureResponseViewSet(viewsets.ModelViewSet):
queryset = TemperatureResponse.objects.all()
serializer_class = TemperatureResponseSerializer
filter_backends = (filters.DjangoFilterBackend, filters.OrderingFilter,)
filter_backends = (DjangoFilterBackend, filters.OrderingFilter,)
filter_fields = ('team_name', 'request', 'archived', 'response_date', 'archive_date')
order_fields = ('response_date', 'archive_date', 'team_name', 'word', 'score')


class TeamResponseHistoryViewSet(viewsets.ModelViewSet):
queryset = TeamResponseHistory.objects.all()
serializer_class = TeamResponseHistorySerializer
filter_backends = (filters.DjangoFilterBackend, filters.SearchFilter, filters.OrderingFilter,)
filter_backends = (DjangoFilterBackend, filters.SearchFilter, filters.OrderingFilter,)
filter_fields = ('request', 'word_list', 'team_name', 'responder_count', 'archive_date')
order_fields = ('request', 'archive_date', 'team_name', 'responder_count', 'average_score')
search_fields = ('word_list',)
Expand All @@ -67,7 +68,7 @@ class TeamResponseHistoryViewSet(viewsets.ModelViewSet):
class TeamsViewSet(viewsets.ModelViewSet):
queryset = Teams.objects.all()
serializer_class = TeamSerializer
filter_backends = (filters.DjangoFilterBackend, filters.OrderingFilter,)
filter_backends = (DjangoFilterBackend, filters.OrderingFilter,)
filter_fields = ('request','team_name')
order_fields = ('request', 'team_name',)

Expand Down

0 comments on commit 00f0076

Please sign in to comment.