Skip to content

Commit

Permalink
Upgrade Django REST Framework to 3.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
tuomas777 committed Dec 21, 2016
1 parent d203c11 commit c51b051
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion events/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -552,6 +552,7 @@ class KeywordSerializer(LinkedEventsSerializer):

class Meta:
model = Keyword
fields = '__all__'


class KeywordRetrieveViewSet(mixins.RetrieveModelMixin, viewsets.GenericViewSet):
Expand Down Expand Up @@ -648,6 +649,7 @@ class PlaceSerializer(LinkedEventsSerializer, GeoModelSerializer):

class Meta:
model = Place
fields = '__all__'


class PlaceFilter(filters.FilterSet):
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c51b051

Please sign in to comment.