From 8c5973f5b60ec8fc4018c3dd298b6e8288a2c5c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 10 Jul 2019 10:51:54 +0200 Subject: [PATCH] misc: don't take over contact/help/accessibility unless defined (#34717) --- auquotidien/modules/root.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/auquotidien/modules/root.py b/auquotidien/modules/root.py index a4698a7..82047d5 100644 --- a/auquotidien/modules/root.py +++ b/auquotidien/modules/root.py @@ -761,7 +761,6 @@ class AlternateRootDirectory(OldRootDirectory): 'saml', 'register', 'ident', 'afterjobs', ('informations-editeur', 'informations_editeur'), ('announces', 'announces_dir'), - 'accessibility', 'contact', 'help', 'myspace', 'services', 'agenda', 'categories', 'user', ('tmp-upload', 'tmp_upload'), 'json', '__version__', 'themes', 'pages', 'payment', 'invoices', 'roles', @@ -871,6 +870,10 @@ class AlternateRootDirectory(OldRootDirectory): # it will get caught in _q_traverse that will redirect it to an # URL embedding the category + if component in ('accessibility', 'contact', 'help'): + if TextsDirectory.get_html_text('aq-' + component): + return getattr(self, component)() + return None def json(self):