Update for newer django

[sommitrealweird.git] / sommitrealweird / photo / views.py

diff --git a/sommitrealweird/photo/views.py b/sommitrealweird/photo/views.py
index 8501a6fef06677a1f74242a031f1912622a20832..bddd15dac75772187c90841e3964e35f463294d0 100644 (file)
--- a/sommitrealweird/photo/views.py
+++ b/sommitrealweird/photo/views.py
@@ -1,6 +1,6 @@
 from django.views.generic import ListView, DetailView
 from django.http import Http404
 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
 
 class AlbumListView(ListView):
     model = Album


@@ -10,12 +10,14 @@ class AlbumListView(ListView):
 class PhotoListView(ListView):
     model = Photo
     paginate_by = 20
 class PhotoListView(ListView):
     model = Photo
     paginate_by = 20

-    order_by = 'order, image'
+
+    def order_by(self):
+        return self.ordering

 
     def get_queryset(self):
         try:
             album = Album.objects.get(slug__exact=self.kwargs['slug'])
 
     def get_queryset(self):
         try:
             album = Album.objects.get(slug__exact=self.kwargs['slug'])

-            return Photo.objects.filter(album=album)
+            return Photo.objects.filter(album=album).order_by('order', 'image')

         except:
             raise Http404
 
         except:
             raise Http404