X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/blobdiff_plain/01976a496f04b06941b601cdef55dd37870d452f..refs/heads/django-4.2:/sommitrealweird/photo/urls.py diff --git a/sommitrealweird/photo/urls.py b/sommitrealweird/photo/urls.py index 64026ce..c5de1db 100644 --- 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[^/]*)/$', 'photo.views.album_view'), - (r'^(?P[^/]*)/(?P[0-9]+)/$', 'photo.views.photo_view'), -) +urlpatterns = [ + re_path(r'^$', AlbumListView.as_view()), + re_path(r'^(?P[^/]*)/$', PhotoListView.as_view()), + re_path(r'^(?P[^/]*)/(?P[0-9]+)/$', PhotoView.as_view()), +]