X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ab8ffbde2df33d9c699e029ba613d2b014ba44b8..6a24f2b3129c2ff848fa4f58a5eaac9afd3896ca:/apps/catalogue/urls.py diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py index 7c1109008..7b1fb3d50 100644 --- a/apps/catalogue/urls.py +++ b/apps/catalogue/urls.py @@ -2,7 +2,7 @@ # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from django.db.models import Max from django.views.generic import ListView, RedirectView from catalogue.feeds import AudiobookFeed @@ -14,9 +14,9 @@ SLUG = r'[a-z0-9-]*' urlpatterns = patterns('picture.views', # pictures - currently pictures are coupled with catalogue, hence the url is here - url(r'^obraz/?$', 'picture_list_thumb', name='picture_list_thumb'), + url(r'^obraz/$', 'picture_list_thumb', name='picture_list_thumb'), url(r'^obraz/(?P%s).html$' % SLUG, 'picture_viewer', name='picture_viewer'), - url(r'^obraz/(?P%s)/?$' % SLUG, 'picture_detail'), + url(r'^obraz/(?P%s)/$' % SLUG, 'picture_detail'), )