X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/d82db041f520a51eccee6788ebc3a494e2a4280f..3c8f423203be690dd0bda32e90eec49f1650e4c6:/sommitrealweird/photo/views.py?ds=inline diff --git a/sommitrealweird/photo/views.py b/sommitrealweird/photo/views.py index 920b1da..02d80e6 100644 --- a/sommitrealweird/photo/views.py +++ b/sommitrealweird/photo/views.py @@ -3,28 +3,34 @@ from django.http import Http404 from models import Album, Photo def album_view(request, slug): - album = Album.objects.get(slug__exact=slug) - photos = Photo.objects.filter(album=album).order_by('order', 'image') - return django.views.generic.list_detail.object_list(request, photos, paginate_by=20, template_name='photo/photo_index.html') + try: + album = Album.objects.get(slug__exact=slug) + photos = Photo.objects.filter(album=album).order_by('order', 'image') + except: + raise Http404 + return django.views.generic.list_detail.object_list(request, photos, paginate_by=20, template_name='photo/photo_index.html', allow_empty=False) def photo_view(request, slug, id): - id = int(id) - album = Album.objects.get(slug__exact=slug) - photos = Photo.objects.filter(album=album).order_by('order', 'image') - photo_qs = Photo.objects.filter(id=id) - found_prev = False - prev_photo = None - found_next = False - next_photo = None - for photo in photos: - if not found_prev: - if not photo.id == id: - prev_photo = photo - else: - found_prev = True - if found_next: - next_photo = photo - break - if photo.id == id: - found_next = True + try: + id = int(id) + album = Album.objects.get(slug__exact=slug) + photos = Photo.objects.filter(album=album).order_by('order', 'image') + photo_qs = Photo.objects.filter(id=id) + found_prev = False + prev_photo = None + found_next = False + next_photo = None + for photo in photos: + if not found_prev: + if not photo.id == id: + prev_photo = photo + else: + found_prev = True + if found_next: + next_photo = photo + break + if photo.id == id: + found_next = True + except: + raise Http404 return django.views.generic.list_detail.object_detail(request, photo_qs, object_id=id, template_name='photo/photo.html', extra_context={"next_photo": next_photo, "prev_photo": prev_photo })