From 3d90ee8b66924bbc30e377955fa356ca47e39667 Mon Sep 17 00:00:00 2001 From: Dhruv Shah Date: Tue, 9 Apr 2024 11:09:44 +0530 Subject: [PATCH] fix: organizing_body field in events --- .../student_welfare_backend/core/api/serializers.py | 4 ++-- .../student_welfare_backend/core/api/views/events.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/student_welfare_backend/student_welfare_backend/core/api/serializers.py b/student_welfare_backend/student_welfare_backend/core/api/serializers.py index 4e54f35..8106b9f 100644 --- a/student_welfare_backend/student_welfare_backend/core/api/serializers.py +++ b/student_welfare_backend/student_welfare_backend/core/api/serializers.py @@ -53,7 +53,7 @@ class Meta: class EventListSerializer(serializers.ModelSerializer): - organization = OrganizationSerializer() + organizing_body = OrganizationSerializer() class Meta: model = Event @@ -61,7 +61,7 @@ class Meta: class EventDetailSerializer(serializers.ModelSerializer): - organization = OrganizationSerializer() + organizing_body = OrganizationSerializer() class Meta: model = Event diff --git a/student_welfare_backend/student_welfare_backend/core/api/views/events.py b/student_welfare_backend/student_welfare_backend/core/api/views/events.py index aac073f..7565adb 100644 --- a/student_welfare_backend/student_welfare_backend/core/api/views/events.py +++ b/student_welfare_backend/student_welfare_backend/core/api/views/events.py @@ -23,11 +23,11 @@ class EventViewSet(ReadOnlyModelViewSet): serializer_class = EventDetailSerializer pagination_class = CustomPagination filter_backends = [SearchFilter, OrderingFilter, DjangoFilterBackend] - filterset_fields = ["organization__name", "venue", "start_time", "end_time"] - search_fields = ["name", "organization__name", "venue", "start_time", "end_time"] + filterset_fields = ["organizing_body__name", "venue", "start_time", "end_time"] + search_fields = ["name", "organizing_body__name", "venue", "start_time", "end_time"] ordering_fields = [ "name", - "organization__name", + "organizing_body__name", "venue", "start_time", "end_time", @@ -76,10 +76,10 @@ class EventAdminViewSet(ModelViewSet): serializer_class = EventDetailSerializer pagination_class = CustomPagination filter_backends = [SearchFilter, OrderingFilter] - search_fields = ["name", "organization__name", "venue", "start_time", "end_time"] + search_fields = ["name", "organizing_body__name", "venue", "start_time", "end_time"] ordering_fields = [ "name", - "organization__name", + "organizing_body__name", "venue", "start_time", "end_time",