equal
deleted
inserted
replaced
1 from django.conf.urls import patterns, include, url |
1 from django.conf.urls import patterns, include, url |
2 import qrurls.views |
2 import qrurls.views |
3 |
3 |
4 urlpatterns = patterns('', |
4 urlpatterns = patterns('', |
5 url(r'^$', qrurls.views.index, name='shorturls'), |
5 url(r'^$', qrurls.views.index, name='shorturls'), |
6 url(r'^(?P<shorturl_id>\d+)/?$', qrurls.views.shorturl, name='miniurl'), |
|
7 url(r'^(?P<shorturl>\w+)/?$', qrurls.views.shorturl, name='shorturl'), |
6 url(r'^(?P<shorturl>\w+)/?$', qrurls.views.shorturl, name='shorturl'), |
|
7 url(r'^(?P<shorturl>\d+)/?$', qrurls.views.shorturl, name='miniurl'), |
8 |
8 |
9 url(r'^(?P<shorturl>\w+)/(?P<item_id>\d+)$', qrurls.views.item, name='shorturl_item'), |
9 url(r'^(?P<shorturl>\w+)/(?P<item_id>\d+)$', qrurls.views.item, name='shorturl_item'), |
10 ) |
10 ) |