From 9d2e907f32f860947691c8eeda540149a35ef9a6 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 11 Apr 2019 15:12:06 +0200 Subject: lazy evaluation of profile mapping --- ishtar_common/forms.py | 4 ++-- ishtar_common/models.py | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index 9b1e2da48..3a696911d 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -704,8 +704,8 @@ def get_form_selection( widget_kwargs['source_full'] = reverse_lazy(get_full_url) if gallery: widget_kwargs['gallery'] = True - if map and models.get_current_profile().mapping: - widget_kwargs['map'] = True + if map: + widget_kwargs['map'] = models.profile_mapping() attrs[key] = forms.IntegerField( label="", required=False, validators=[models.valid_id(model)], diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 4d699bfd8..74151fa31 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2620,6 +2620,13 @@ def get_current_profile(force=False): return IshtarSiteProfile.get_current_profile(force=force) +def _profile_mapping(): + return get_current_profile().mapping + + +profile_mapping = lazy(_profile_mapping) + + def cached_site_changed(sender, **kwargs): get_current_profile(force=True) from ishtar_common.menus import Menu -- cgit v1.2.3