Update for newer django

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

diff --git a/sommitrealweird/photo/urls.py b/sommitrealweird/photo/urls.py
index 64026ce61393d68e2b51627fd8ce5eb9b7e0b797..c5de1db56b170bedfb9432ecc7f38d478009141d 100644 (file)
--- a/sommitrealweird/photo/urls.py
+++ b/sommitrealweird/photo/urls.py
@@ -1,8 +1,9 @@
-from django.conf.urls.defaults import *
-from models import Album
+from django.urls import re_path
+from photo.models import Album
+from photo.views import AlbumListView, PhotoListView, PhotoView

 
 

-urlpatterns = patterns('',
-    (r'^$', 'django.views.generic.list_detail.object_list', { "paginate_by": 20, "queryset": Album.objects.all().order_by('name'), "template_name": "photo/album_index.html"}),
-    (r'^(?P<slug>[^/]*)/$', 'photo.views.album_view'),
-    (r'^(?P<slug>[^/]*)/(?P<id>[0-9]+)/$', 'photo.views.photo_view'),
-)
+urlpatterns = [
+    re_path(r'^$', AlbumListView.as_view()),
+    re_path(r'^(?P<slug>[^/]*)/$', PhotoListView.as_view()),
+    re_path(r'^(?P<slug>[^/]*)/(?P<id>[0-9]+)/$', PhotoView.as_view()),
+]