diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-01-19 00:42:18 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-01-19 00:42:18 -0300 |
| commit | 27d7ccd7a928da74a881cf4fbd508e23613780fa (patch) | |
| tree | ebed6ca44c1a5512b272685234ddfbb76fba76d8 /news/urls.py | |
| parent | 755a03d279631138cb982dc07b2d67b341a4f99c (diff) | |
| parent | 523a15f81e819379d1d9ae8412ebd8a7c017a512 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
templates/devel/clock.html
templates/packages/group_details.html
templates/packages/groups.html
Diffstat (limited to 'news/urls.py')
| -rw-r--r-- | news/urls.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/news/urls.py b/news/urls.py index 548d80ea..d938ef58 100644 --- a/news/urls.py +++ b/news/urls.py @@ -4,11 +4,11 @@ urlpatterns = patterns('news.views', (r'^$', 'news_list', {}, 'news-list'), (r'^add/$', 'add'), (r'^preview/$', 'preview'), + # old news URLs, permanent redirect view so we don't break all links + (r'^(?P<object_id>\d+)/$', 'view_redirect'), (r'^(?P<slug>[-\w]+)/$', 'view'), (r'^(?P<slug>[-\w]+)/edit/$', 'edit'), (r'^(?P<slug>[-\w]+)/delete/$', 'delete'), - # old news URLs, permanent redirect view so we don't break all links - (r'^(?P<object_id>\d+)/$', 'view_redirect'), ) # vim: set ts=4 sw=4 et: |