From c51b05141617b15ae2f7a771d7a55a3240c0f58d Mon Sep 17 00:00:00 2001 From: Tuomas Haapala Date: Wed, 21 Dec 2016 22:41:43 +0200 Subject: [PATCH] Upgrade Django REST Framework to 3.5.3 Closes #169 --- events/api.py | 6 +++++- requirements.txt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/events/api.py b/events/api.py index 163f8cbe8..b8cb429d1 100644 --- a/events/api.py +++ b/events/api.py @@ -61,7 +61,7 @@ def get_view_name(cls, suffix=None): - if cls.__name__ == 'APIRoot': + if cls.__name__ == 'APIRootView': return 'Linked Events' return original_get_view_name(cls, suffix) @@ -552,6 +552,7 @@ class KeywordSerializer(LinkedEventsSerializer): class Meta: model = Keyword + fields = '__all__' class KeywordRetrieveViewSet(mixins.RetrieveModelMixin, viewsets.GenericViewSet): @@ -648,6 +649,7 @@ class PlaceSerializer(LinkedEventsSerializer, GeoModelSerializer): class Meta: model = Place + fields = '__all__' class PlaceFilter(filters.FilterSet): @@ -720,6 +722,7 @@ class LanguageSerializer(LinkedEventsSerializer): class Meta: model = Language + fields = '__all__' def get_translation_available(self, obj): return obj.id in [language[0] for language in settings.LANGUAGES] @@ -773,6 +776,7 @@ class ImageSerializer(LinkedEventsSerializer): class Meta: model = Image + fields = '__all__' def to_representation(self, obj): # the url field is customized based on image and url diff --git a/requirements.txt b/requirements.txt index fe73a35cb..1b8152e3c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,7 +28,7 @@ django==1.9.11 djangorestframework-bulk==0.2.1 djangorestframework-gis==0.10.1 djangorestframework-jwt==1.8.0 -djangorestframework==3.3.3 +djangorestframework==3.5.3 easy-thumbnails==2.3 elasticsearch==2.4.0 first==2.0.1 # via pip-tools