diff --git a/webapp/views.py b/webapp/views.py index 94249d4..4f3f055 100644 --- a/webapp/views.py +++ b/webapp/views.py @@ -44,9 +44,10 @@ class EventViewSet(viewsets.ModelViewSet): search_fields = '__all__' def get_queryset(self): - since = self.request.query_params.get('since', None) if self.request.user.is_authenticated: return Event.objects.all() + + since = self.request.query_params.get('since', None) if since: return Event.objects.filter(visible=True, end_time__gt=since).order_by('start_time') return Event.objects.filter(visible=True, end_time__gt=timezone.now()).order_by('start_time') @@ -105,7 +106,7 @@ class FeedViewSet(viewsets.ModelViewSet): def get_queryset(self): if self.request.user.is_authenticated: - objs = Feed.objects.all().order_by('publish_time') + return Feed.objects.all().order_by('publish_time') else: objs = Feed.objects.filter(visible=True).order_by('publish_time')