declare agendas app & urls

diff --git a/debian/control b/debian/control
index 3f440919df5b58382d52a2e3b80ffc300e065340..170246a65c9c3410ee4bfe555351457969bd3b32 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Package: panikdb
 Architecture: all
 Depends: python3-django-ckeditor,
          python3-django-haystack,
+         python3-django-panik-agendas,
          python3-django-panik-combo,
          python3-django-panik-emissions,
          python3-django-panik-matos,

diff --git a/panikdb/settings.py b/panikdb/settings.py
index 73b42a90ef590259b384bcbf6263b9e586d8b050..b311c7ecf16c73abf34ea496a358bd07e5d162e5 100644 (file)
--- a/panikdb/settings.py
+++ b/panikdb/settings.py
@@ -149,6 +149,7 @@ INSTALLED_APPS = (
     'newsletter',
     'matos',
     'wiki',
+    'agendas',
     'nonstop',
     'panikdb.aa',
     'panikdb.customtags',

diff --git a/panikdb/urls.py b/panikdb/urls.py
index 585d5f3f9c66bbd33d8b8dca3ac3dbfb03eb38e1..c042c64168efe60a902037ffdcedcffdf94dfdfe 100644 (file)
--- a/panikdb/urls.py
+++ b/panikdb/urls.py
@@ -26,6 +26,7 @@ from .aa.urls import urlpatterns as aa_urlpatterns
 from .service_messages.urls import urlpatterns as service_messages_urlpatterns
 from wiki.urls import urlpatterns as wiki_urlpatterns
 from panikombo.urls import urlpatterns as panikombo_urlpatterns
+from agendas.urls import urlpatterns as agendas_urlpatterns
 
 from .poll import views as poll_views
 from .forms import AuthenticationForm
@@ -81,6 +82,7 @@ urlpatterns = [
         combo.public.views.ajax_page_cell,
         name='combo-public-ajax-page-cell',
     ),
+    url(r'^agendas/', decorated_includes(login_required, include(agendas_urlpatterns))),
     url(r'^panikombo/', include(panikombo_urlpatterns)),
     url(r'^wiki/', include(wiki_urlpatterns)),
     url(r'^regie/', include(regie_urlpatterns)),