From a2b58c3aad97278f40c7d0dc263845669e76df97 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 21 Feb 2017 19:50:52 +0100 Subject: [PATCH] Try to fix agenda urls --- app/organization/agenda/urls.py | 2 +- lib/mezzanine | 2 +- lib/mezzanine-agenda | 2 +- var | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/organization/agenda/urls.py b/app/organization/agenda/urls.py index d9f2fa61..d60ccf19 100644 --- a/app/organization/agenda/urls.py +++ b/app/organization/agenda/urls.py @@ -34,8 +34,8 @@ from organization.agenda.views import * urlpatterns = [ - url("^%s/list" % settings.EVENT_SLUG, CustomEventListView.as_view(), name="event_list"), url("^%s/" % settings.EVENT_SLUG, include("mezzanine_agenda.urls")), + url("^%s/list/$" % settings.EVENT_SLUG, CustomEventListView.as_view(), name="custom_event_list"), url("^%s/confirmation/(?P[0-9]*)$" % settings.EVENT_SLUG, ConfirmationView.as_view(), name="organization-agenda-confirmation"), url("^dynamic-content-event/$", permission_required('event.can_edit')(DynamicContentEventView.as_view()), name='dynamic-content-event'), ] diff --git a/lib/mezzanine b/lib/mezzanine index 51cf69d9..86b75673 160000 --- a/lib/mezzanine +++ b/lib/mezzanine @@ -1 +1 @@ -Subproject commit 51cf69d973848f08bc482022fd5bdac9a41f8ff9 +Subproject commit 86b75673db4567f0e7907874717bfbbfc91c64ad diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda index 2b2de20c..a072d9a6 160000 --- a/lib/mezzanine-agenda +++ b/lib/mezzanine-agenda @@ -1 +1 @@ -Subproject commit 2b2de20c2ecbe6b7a5a56eb30c8ccb942eba434c +Subproject commit a072d9a6af89c14150df71544df53b7f77cf3bc8 diff --git a/var b/var index 9a292ad5..e35bbe73 160000 --- a/var +++ b/var @@ -1 +1 @@ -Subproject commit 9a292ad53e9733951f585568d7c0efd9617e3619 +Subproject commit e35bbe738e298a0fe37160f2c46cf16d42265ccb -- 2.39.5