From 3a5fad0287b5bc605e8984c6c4a7301f3df42c58 Mon Sep 17 00:00:00 2001 From: Grizzly Date: Sun, 11 Aug 2019 19:51:31 +0000 Subject: [PATCH] =?UTF-8?q?Separation=20des=20lists=20d'apps=20optionnelle?= =?UTF-8?q?s=20pour=20eviter=20les=20erreurs=20d'import=20d'urls=20non=20p?= =?UTF-8?q?r=C3=A9sents?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- preferences/views.py | 4 ++-- re2o/context_processors.py | 4 ++-- re2o/settings_local.example.py | 5 ++++- re2o/urls.py | 4 ++-- re2o/views.py | 4 ++-- users/views.py | 4 ++-- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/preferences/views.py b/preferences/views.py index 680fcac0..471207e0 100644 --- a/preferences/views.py +++ b/preferences/views.py @@ -41,7 +41,7 @@ from django.utils.translation import ugettext as _ from reversion import revisions as reversion from importlib import import_module -from re2o.settings_local import OPTIONNAL_APPS +from re2o.settings_local import OPTIONNAL_APPS_RE2O from re2o.views import form from re2o.acl import can_create, can_edit, can_delete_set, can_view_all, can_delete @@ -97,7 +97,7 @@ def display_options(request): cotisationsoptions, _created = CotisationsOption.objects.get_or_create() document_template_list = DocumentTemplate.objects.order_by('name') - optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS] + optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS_RE2O] optionnal_templates_list = [app.views.preferences(request) for app in optionnal_apps] return form({ diff --git a/re2o/context_processors.py b/re2o/context_processors.py index 860a5a58..67a700be 100644 --- a/re2o/context_processors.py +++ b/re2o/context_processors.py @@ -30,7 +30,7 @@ from django.http import HttpRequest from preferences.models import GeneralOption, OptionalMachine from django.utils.translation import get_language from importlib import import_module -from re2o.settings_local import OPTIONNAL_APPS +from re2o.settings_local import OPTIONNAL_APPS_RE2O def context_user(request): """Fonction de context lorsqu'un user est logué (ou non), @@ -61,7 +61,7 @@ def context_user(request): def context_optionnal_apps(request): """Fonction de context pour générer la navbar en fonction des apps optionnels""" - optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS] + optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS_RE2O] optionnal_templates_navbar_user_list = [app.views.navbar_user(request) for app in optionnal_apps] optionnal_templates_navbar_logout_list = [app.views.navbar_logout(request) for app in optionnal_apps] return {'optionnal_templates_navbar_user_list':optionnal_templates_navbar_user_list, diff --git a/re2o/settings_local.example.py b/re2o/settings_local.example.py index 662c1447..bb0fd21e 100644 --- a/re2o/settings_local.example.py +++ b/re2o/settings_local.example.py @@ -108,5 +108,8 @@ GID_RANGES = { 'posix': [501, 600], } +# Some optionnal Re2o Apps +OPTIONNAL_APPS_RE2O = () + # Some Django apps you want to add in you local project -OPTIONNAL_APPS = () +OPTIONNAL_APPS = OPTIONNAL_APPS_RE2O + () diff --git a/re2o/urls.py b/re2o/urls.py index 5db9abe8..8af7335a 100644 --- a/re2o/urls.py +++ b/re2o/urls.py @@ -49,7 +49,7 @@ from django.contrib import admin from django.utils.translation import gettext_lazy as _ from django.views.generic import RedirectView -from .settings_local import OPTIONNAL_APPS +from .settings_local import OPTIONNAL_APPS_RE2O from .views import index, about_page, contact_page @@ -87,7 +87,7 @@ urlpatterns = [ ] -urlpatterns += [url(r'^{}/'.format(app), include('{}.urls'.format(app), namespace=app)) for app in OPTIONNAL_APPS] +urlpatterns += [url(r'^{}/'.format(app), include('{}.urls'.format(app), namespace=app)) for app in OPTIONNAL_APPS_RE2O] # Add debug_toolbar URLs if activated if 'debug_toolbar' in settings.INSTALLED_APPS: diff --git a/re2o/views.py b/re2o/views.py index c4c8b72e..17622fd5 100644 --- a/re2o/views.py +++ b/re2o/views.py @@ -44,7 +44,7 @@ from preferences.models import ( from .contributors import CONTRIBUTORS from importlib import import_module -from re2o.settings_local import OPTIONNAL_APPS +from re2o.settings_local import OPTIONNAL_APPS_RE2O def form(ctx, template, request): @@ -115,7 +115,7 @@ def contact_page(request): """ address = MailContact.objects.all() - optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS] + optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS_RE2O] optionnal_templates_contact_list = [app.views.contact(request) for app in optionnal_apps] return render( diff --git a/users/views.py b/users/views.py index 426645e5..045446b1 100644 --- a/users/views.py +++ b/users/views.py @@ -57,7 +57,7 @@ from machines.models import Machine from preferences.models import OptionalUser, GeneralOption, AssoOption from importlib import import_module -from re2o.settings_local import OPTIONNAL_APPS +from re2o.settings_local import OPTIONNAL_APPS_RE2O from re2o.views import form from re2o.utils import ( all_has_access, @@ -979,7 +979,7 @@ def profil(request, users, **_kwargs): SortTable.MACHINES_INDEX ) - optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS] + optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS_RE2O] optionnal_templates_list = [app.views.profil(request,users) for app in optionnal_apps] pagination_large_number = GeneralOption.get_cached_value(