From c00635dfe09d0e6043fa0aacb87188bfd3f62ab6 Mon Sep 17 00:00:00 2001
From: Alice Heaton <aliceh@aptivate.org>
Date: Thu, 6 Aug 2015 11:12:51 +0100
Subject: [PATCH] Fix url patterns. We could fix the single regexp, but
apparently best practice is to have this on multiple lines.
---
django/website/tabbed_page/urls.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/django/website/tabbed_page/urls.py b/django/website/tabbed_page/urls.py
index 58eae809..883261c4 100644
--- a/django/website/tabbed_page/urls.py
+++ b/django/website/tabbed_page/urls.py
@@ -4,7 +4,9 @@ from django.contrib.auth.decorators import login_required
from .views import TabbedPageView
urlpatterns = [
- url(r'^(?P<name>[^/]*)(/(?P<tab_name>.*))?$',
- TabbedPageView.as_view(),
+ url(r'^/$', login_required(TabbedPageView.as_view())),
+ url(r'^(?P<name>\w+)/$', login_required(TabbedPageView.as_view())),
+ url(r'^(?P<name>\w+)/(?P<tab_name>\w+)/$',
+ login_required(TabbedPageView.as_view()),
name='tabbed-page')
]
--
GitLab