Rizwan.Shaikh/goodtimes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65 from WDI-Ideas/development

Browse Source 
Development
This commit is contained in:
BOBBY VISHWAKARMA
2024-07-12 16:04:39 +05:30
committed by GitHub
parent 5d320cccfe 83efd28687
commit 8faa9eb81f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manage_events/api/serializers.py
View File

@@ -41,7 +41,7 @@ class VenueSerializer(serializers.ModelSerializer):
class VenueShortSerializer(serializers.ModelSerializer): class VenueShortSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Venue model = Venue
fields= ["id","title"] fields = ["id", "title"]
class EventCategorySerializer(serializers.ModelSerializer): class EventCategorySerializer(serializers.ModelSerializer):

6
manage_events/api/views.py
View File

@@ -990,7 +990,7 @@ class EventShareView(APIView):
class EventListView(generics.ListAPIView): class EventListView(generics.ListAPIView):
authentication_classes = [JWTAuthentication] authentication_classes = [JWTAuthentication]
permission_classes = [IsAuthenticated] permission_classes = [IsAuthenticated]
queryset = Event.objects.filter(active=True, draft=False, deleted=False) queryset = Event.objects.filter(active=True, draft=False, deleted=False, end_date__gte=timezone.now().date())
serializer_class = EventListSerializer serializer_class = EventListSerializer
filter_backends = [DjangoFilterBackend] filter_backends = [DjangoFilterBackend]
filterset_class = EventFilter filterset_class = EventFilter
@@ -1010,7 +1010,7 @@ class EventListView(generics.ListAPIView):
# Replace 'latest' with '-created_on' in the ordering fields # Replace 'latest' with '-created_on' in the ordering fields
ordering = ",".join( ordering = ",".join(
"-created_on" if field == "latest" else f"-{field}" "start_date" if field == "latest" else f"-{field}"
for field in ordering_fields for field in ordering_fields
) )
# Apply the ordering to the queryset # Apply the ordering to the queryset
@@ -1042,4 +1042,4 @@ class EventListView(generics.ListAPIView):
data = self.get_paginated_response(serializer.data) data = self.get_paginated_response(serializer.data)
return ApiResponse.success(message=constants.SUCCESS, data=data) return ApiResponse.success(message=constants.SUCCESS, data=data)
serializer = self.get_serializer(queryset, many=True) serializer = self.get_serializer(queryset, many=True)
return ApiResponse.success(message=constants.SUCCESS, data=serializer.data) return ApiResponse.success(message=constants.SUCCESS, data=serializer.data)