diff --git a/bds/context_processors.py b/bds/context_processors.py deleted file mode 100644 index c1d81bc6..00000000 --- a/bds/context_processors.py +++ /dev/null @@ -1,5 +0,0 @@ -from bds.models import BDSProfile - - -def member_count(request): - return {"member_count": BDSProfile.objects.filter(is_member=True).count()} diff --git a/bds/views.py b/bds/views.py index e12185f7..0318d1e6 100644 --- a/bds/views.py +++ b/bds/views.py @@ -8,6 +8,7 @@ from django.views.generic import DeleteView, TemplateView from bds.autocomplete import bds_search from bds.forms import ProfileForm, UserForm, UserFromClipperForm, UserFromScratchForm from bds.mixins import MultipleFormView, StaffRequiredMixin +from bds.models import BDSProfile from shared.views import AutocompleteView User = get_user_model() @@ -21,6 +22,11 @@ class BDSAutocompleteView(StaffRequiredMixin, AutocompleteView): class Home(StaffRequiredMixin, TemplateView): template_name = "bds/home.html" + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["member_count"] = BDSProfile.objects.filter(is_member=True).count() + return context + class UserUpdateView(StaffRequiredMixin, MultipleFormView): template_name = "bds/user_update.html" diff --git a/cof/settings/bds_prod.py b/cof/settings/bds_prod.py index 9379d44d..12f5a552 100644 --- a/cof/settings/bds_prod.py +++ b/cof/settings/bds_prod.py @@ -2,10 +2,8 @@ Django development settings for the cof project. The settings that are not listed here are imported from .common """ -import os - from .common import * # NOQA -from .common import BASE_DIR, INSTALLED_APPS, TEMPLATES +from .common import INSTALLED_APPS # --- # BDS-only Django settings @@ -20,10 +18,6 @@ STATIC_URL = "/gestion2/static/" MEDIA_ROOT = "/srv/bds.ens.fr/gestion2/media" MEDIA_URL = "/gestion2/media/" -TEMPLATES[0]["OPTIONS"]["context_processors"] += [ - "bds.context_processors.member_count", -] - # --- # Auth-related stuff diff --git a/cof/settings/local.py b/cof/settings/local.py index 27acf74b..c3607d7f 100644 --- a/cof/settings/local.py +++ b/cof/settings/local.py @@ -3,7 +3,7 @@ import os from . import bds_prod from .cof_prod import * # NOQA -from .cof_prod import BASE_DIR, INSTALLED_APPS, MIDDLEWARE, TEMPLATES, TESTING +from .cof_prod import BASE_DIR, INSTALLED_APPS, MIDDLEWARE, TESTING # --- # Merge COF and BDS configs @@ -13,10 +13,6 @@ for app in bds_prod.INSTALLED_APPS: if app not in INSTALLED_APPS: INSTALLED_APPS.append(app) -TEMPLATES[0]["OPTIONS"]["context_processors"] += [ - "bds.context_processors.member_count", -] - # --- # Tweaks for debug/local development # ---