]> git.parisson.com Git - mezzo.git/commitdiff
Try to fix agenda urls
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 21 Feb 2017 18:50:52 +0000 (19:50 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 21 Feb 2017 18:50:52 +0000 (19:50 +0100)
app/organization/agenda/urls.py
lib/mezzanine
lib/mezzanine-agenda
var

index d9f2fa61cc71707caa13e1272335ad41607383af..d60ccf19c98f57d5cdaba160ef289a5e4cdc8819 100644 (file)
@@ -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<transaction_id>[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'),
 ]
index 51cf69d973848f08bc482022fd5bdac9a41f8ff9..86b75673db4567f0e7907874717bfbbfc91c64ad 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 51cf69d973848f08bc482022fd5bdac9a41f8ff9
+Subproject commit 86b75673db4567f0e7907874717bfbbfc91c64ad
index 2b2de20c2ecbe6b7a5a56eb30c8ccb942eba434c..a072d9a6af89c14150df71544df53b7f77cf3bc8 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 2b2de20c2ecbe6b7a5a56eb30c8ccb942eba434c
+Subproject commit a072d9a6af89c14150df71544df53b7f77cf3bc8
diff --git a/var b/var
index 9a292ad53e9733951f585568d7c0efd9617e3619..e35bbe738e298a0fe37160f2c46cf16d42265ccb 160000 (submodule)
--- a/var
+++ b/var
@@ -1 +1 @@
-Subproject commit 9a292ad53e9733951f585568d7c0efd9617e3619
+Subproject commit e35bbe738e298a0fe37160f2c46cf16d42265ccb