summaryrefslogtreecommitdiffstats
path: root/news
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2018-01-01 22:25:02 +0100
committerJelle van der Waa <jelle@vdwaa.nl>2018-04-08 12:51:19 +0200
commit996ef6ec7205ac3c09b6d66ddcfbf91b21bed5b4 (patch)
treede922c4fa251187ac80e31198957e45ddbaaf479 /news
parent2fbbbf946fcb5cc0ceeb8031b778e184995ddefc (diff)
downloadarchweb-996ef6ec7205ac3c09b6d66ddcfbf91b21bed5b4.tar.gz
archweb-996ef6ec7205ac3c09b6d66ddcfbf91b21bed5b4.zip
Change urls.py from patterns to list of url()
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Diffstat (limited to 'news')
-rw-r--r--news/urls.py22
1 files changed, 12 insertions, 10 deletions
diff --git a/news/urls.py b/news/urls.py
index c13722d4..43f9f62a 100644
--- a/news/urls.py
+++ b/news/urls.py
@@ -1,24 +1,26 @@
-from django.conf.urls import patterns
+from django.conf.urls import url
from django.contrib.auth.decorators import permission_required
from .views import (NewsDetailView, NewsListView,
NewsCreateView, NewsEditView, NewsDeleteView)
+import views
-urlpatterns = patterns('news.views',
- (r'^$', NewsListView.as_view(), {}, 'news-list'),
- (r'^preview/$', 'preview'),
+urlpatterns = [
+ url(r'^$', NewsListView.as_view(), name='news-list'),
+
+ url(r'^preview/$', views.preview),
# old news URLs, permanent redirect view so we don't break all links
- (r'^(?P<object_id>\d+)/$', 'view_redirect'),
+ url(r'^(?P<object_id>\d+)/$', views.view_redirect),
- (r'^add/$',
+ url(r'^add/$',
permission_required('news.add_news')(NewsCreateView.as_view())),
- (r'^(?P<slug>[-\w]+)/$',
+ url(r'^(?P<slug>[-\w]+)/$',
NewsDetailView.as_view()),
- (r'^(?P<slug>[-\w]+)/edit/$',
+ url(r'^(?P<slug>[-\w]+)/edit/$',
permission_required('news.change_news')(NewsEditView.as_view())),
- (r'^(?P<slug>[-\w]+)/delete/$',
+ url(r'^(?P<slug>[-\w]+)/delete/$',
permission_required('news.delete_news')(NewsDeleteView.as_view())),
-)
+]
# vim: set ts=4 sw=4 et: