00dani/lemoncurry
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Simplify entry routing by using one route with an optional slug for permalinks, rather than a route with a slug and a route without

Browse source
This commit is contained in:
Danielle McLean 2017-10-28 14:01:31 +11:00
parent 1f6a587329
commit 5987e54105
Signed by: 00dani
GPG key ID: 5A5D2D1AFF12EEC5
3 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
entries/urls.py
View file

@ -3,8 +3,8 @@ from . import kinds, views
from lemoncurry import breadcrumbs as crumbs
def to_url(*args):
return '^{0}$'.format('/'.join(args))
def to_pat(*args):
return '^{0}$'.format(''.join(args))
def prefix(route):
@ -15,14 +15,12 @@ app_name = 'entries'
urlpatterns = []
for k in kinds.all:
kind = k.plural
id = r'(?P<id>\d+)'
slug = r'(?P<slug>.+)'
id = r'/(?P<id>\d+)'
slug = r'(?:/(?P<slug>.+))?'
urlpatterns += (
url(to_url(kind), views.index, name=k.index, kwargs={'kind': k}),
url(to_url(kind, id), views.entry, name=k.entry),
url(to_url(kind, id, slug), views.entry, name=k.entry_slug),
url(to_pat(kind), views.index, name=k.index, kwargs={'kind': k}),
url(to_pat(kind, id, slug), views.entry, name=k.entry),
)
crumbs.add(prefix(k.index), label=k.plural, parent='home:index')
crumbs.add(prefix(k.entry), parent=prefix(k.index))
crumbs.add(prefix(k.entry_slug), parent=prefix(k.index))