Merge 7abfe04 into 554603d

tavern/views.py

@@ -9,6 +9,7 @@
 from django.views.generic import DetailView
 from django.views.generic import CreateView, UpdateView, DeleteView
 from django.views.generic.detail import SingleObjectMixin
+from django.http import Http404
 
 from guardian.mixins import LoginRequiredMixin, PermissionRequiredMixin
 
@@ -129,8 +130,12 @@ class EventDetail(UpcomingEventsMixin, DetailView):
     context_object_name = "event"
     model = Event
 
-    def get_queryset(self, **kwargs):
-        return self.model.visible_events.all()
+    def get(self, request, *args, **kwargs):
+        event_slug = self.kwargs['slug']
+        event = get_object_or_404(Event, slug=event_slug)
+        if not event.show:
+            raise Http404
+        return super(EventDetail, self).get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
         context = super(EventDetail, self).get_context_data(**kwargs)