diff --git a/api/event/serializers.py b/api/event/serializers.py index 4f8ca16..13ab7fd 100644 --- a/api/event/serializers.py +++ b/api/event/serializers.py @@ -120,7 +120,8 @@ class ActivityTemplateSerializer(serializers.ModelSerializer): # TODO rajouter des permissions class ActivitySerializer(serializers.ModelSerializer): event = EventSerializer(read_only=True) - parent = serializers.PrimaryKeyRelatedField(queryset=ActivityTemplate.objects.all(), allow_null=True) + parent = serializers.PrimaryKeyRelatedField( + queryset=ActivityTemplate.objects.all(), allow_null=True) en_perm = UserSerializer(read_only=True) tags = ActivityTagSerializer(many=True) diff --git a/api/event/views.py b/api/event/views.py index b360583..316bc59 100644 --- a/api/event/views.py +++ b/api/event/views.py @@ -2,6 +2,7 @@ from django.contrib.auth import get_user_model from django.db.models import Q from rest_framework.viewsets import ModelViewSet +from rest_framework.filters import OrderingFilter from api.event.serializers import EventSerializer, PlaceSerializer,\ ActivityTagSerializer, ActivityTemplateSerializer, ActivitySerializer @@ -51,6 +52,11 @@ class EventViewSet(ModelViewSet): queryset = Event.objects.all() serializer_class = EventSerializer + filter_backends = (OrderingFilter,) + ordering_fields = ('title', 'creation_date', 'beginning_date', + 'ending_date', ) + ordering = ('beginning_date', ) + def perform_create(self, serializer): serializer.save(created_by=self.request.user) @@ -59,11 +65,19 @@ class PlaceViewSet(EventSpecificViewSet): queryset = Place.objects.all() serializer_class = PlaceSerializer + filter_backends = (OrderingFilter,) + ordering_fields = ('name', ) + ordering = ('name', ) + class ActivityTagViewSet(EventSpecificViewSet): queryset = ActivityTag.objects.all() serializer_class = ActivityTagSerializer + filter_backends = (OrderingFilter,) + ordering_fields = ('name', ) + ordering = ('name', ) + class ActivityTemplateViewSet(ModelViewSet): """ @@ -82,6 +96,10 @@ class ActivityTemplateViewSet(ModelViewSet): event_pk = self.kwargs.get('event_pk') serializer.save(event_pk=event_pk) + filter_backends = (OrderingFilter,) + ordering_fields = ('title', ) + ordering = ('title', ) + class ActivityViewSet(ModelViewSet): """ @@ -99,3 +117,7 @@ class ActivityViewSet(ModelViewSet): def perform_update(self, serializer): event_pk = self.kwargs.get('event_pk') serializer.save(event_pk=event_pk) + + filter_backends = (OrderingFilter,) + ordering_fields = ('title', ) + ordering = ('title', )