X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/5f6086698809e16bfe5c6c5316d1ed687cf56dc9..0da449be342d2024f3c87a065ed30da80c96bfa5:/sommitrealweird/photo/views.py?ds=inline

diff --git a/sommitrealweird/photo/views.py b/sommitrealweird/photo/views.py
index 28955ab..fea7dd3 100644
--- a/sommitrealweird/photo/views.py
+++ b/sommitrealweird/photo/views.py
@@ -1,30 +1,35 @@
 from django.views.generic import ListView, DetailView
 from django.http import Http404
-from models import Album, Photo
+from photo.models import Album, Photo
 
 class AlbumListView(ListView):
     model = Album
     queryset = Album.objects.order_by('-name')
     paginate_by = 20
 
-    def get_context_data(self, **kwargs):
-        context = super(AlbumListView, self).get_context_data(**kwargs)
-        return context
-
 class PhotoListView(ListView):
     model = Photo
     paginate_by = 20
     order_by = 'order, image'
 
     def get_queryset(self):
-        album = Album.objects.get(slug__exact=self.kwargs['slug'])
-        return Photo.objects.filter(album=album)
+        try:
+            album = Album.objects.get(slug__exact=self.kwargs['slug'])
+            return Photo.objects.filter(album=album)
+        except:
+            raise Http404
 
 class PhotoView(DetailView):
-    model = Photo
+
+    def get_queryset(self, **kwargs):
+        return Photo.objects.get(id=self.kwargs['id']).get_queryset()
 
     def get_object(self, **kwargs):
-        return Photo.objects.get(id=self.kwargs['id'])
+        try:
+            photo = Photo.objects.get(id=self.kwargs['id'])
+            return photo
+        except:
+            raise Http404
 
     def get_context_data(self, **kwargs):
         context = super(PhotoView, self).get_context_data(**kwargs)
@@ -52,4 +57,3 @@ class PhotoView(DetailView):
         context['prev_photo'] = prev_photo
 
         return context
-