lots of updates ... eeks
This commit is contained in:
@@ -37,11 +37,22 @@ class CalAPIView(generics.ListAPIView):
|
||||
|
||||
class EventsAPIView(generics.ListAPIView):
|
||||
serializer_class = EventSerializer
|
||||
queryset = Event.objects.filter(show_date__gte=odt).order_by('show_date')
|
||||
filter_backends = [DjangoFilterBackend, filters.SearchFilter]
|
||||
filterset_fields = ['show_title', 'event_type', 'venue__name','show_day', 'calendar__shortcode',]
|
||||
search_fields = ['show_title', 'event_type','show_day', 'venue__name', 'calendar__shortcode',]
|
||||
permission_classes = [HasAPIKey]
|
||||
# queryset = Event.objects.filter(show_date__gte=odt).order_by('show_day')
|
||||
queryset = Event.objects.all()
|
||||
# filter_backends = [DjangoFilterBackend, filters.SearchFilter]
|
||||
# filterset_fields = ['show_title', 'event_type', 'venue__name','show_day', 'calendar__shortcode', 'show_date',]
|
||||
# search_fields = ['show_title', 'event_type','show_day', 'venue__name', 'calendar__shortcode',]
|
||||
# permission_classes = [HasAPIKey]
|
||||
|
||||
def get_queryset(self):
|
||||
calendar = self.request.GET.get('calendar__shortcode')
|
||||
show_day = self.request.GET.get('show_date')
|
||||
if self.request.GET.get('event_type') != None:
|
||||
event_type = self.request.GET.get('event_type')
|
||||
queryset = Event.objects.filter(event_type=event_type,calendar__shortcode=calendar,show_date__gte=show_day).order_by('show_date')
|
||||
return queryset
|
||||
queryset = Event.objects.filter(calendar__shortcode=calendar,show_date__gte=show_day).order_by('show_date')
|
||||
return queryset
|
||||
|
||||
|
||||
class PromoAPIView(generics.ListAPIView):
|
||||
@@ -49,7 +60,7 @@ class PromoAPIView(generics.ListAPIView):
|
||||
queryset = Promo.objects.filter(published=True)
|
||||
filterset_fields = ['organization__name', 'calendar__shortcode',]
|
||||
search_fields = ['organization__name', 'calendar__shortcode',]
|
||||
permission_classes = [HasAPIKey]
|
||||
# permission_classes = [HasAPIKey]
|
||||
|
||||
def get_queryset(self):
|
||||
calendar = self.request.GET.get('calendar__shortcode')
|
||||
|
||||
Reference in New Issue
Block a user