From c058ab18d72d05a3a388cbb31df2760cd27bb078 Mon Sep 17 00:00:00 2001 From: Boris Besemer Date: Thu, 22 Dec 2016 10:10:41 +0100 Subject: [PATCH] fixes adapter instantiating so it can be used outside of the hooks --- src/personalisation/app_settings.py | 2 +- src/personalisation/wagtail_hooks.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/personalisation/app_settings.py b/src/personalisation/app_settings.py index c6fce6a..093b967 100644 --- a/src/personalisation/app_settings.py +++ b/src/personalisation/app_settings.py @@ -3,5 +3,5 @@ from django.conf import settings from personalisation.utils import import_class -segments_adapter = import_class(getattr(settings, 'PERSONALISATION_SEGMENTS_ADAPTER', 'personalisation.adapters.SessionSegmentsAdapter')) +segments_adapter = import_class(getattr(settings, 'PERSONALISATION_SEGMENTS_ADAPTER', 'personalisation.adapters.SessionSegmentsAdapter'))() diff --git a/src/personalisation/wagtail_hooks.py b/src/personalisation/wagtail_hooks.py index c81cc47..5f28a9f 100644 --- a/src/personalisation/wagtail_hooks.py +++ b/src/personalisation/wagtail_hooks.py @@ -19,7 +19,6 @@ from personalisation.models import (AbstractBaseRule, PersonalisablePage, from personalisation.utils import impersonate_other_page logger = logging.getLogger() -adapter = segments_adapter() @hooks.register('register_admin_urls') @@ -81,8 +80,8 @@ def set_visit_count(page, request, serve_args, serve_kwargs): @hooks.register('before_serve_page') def segment_user(page, request, serve_args, serve_kwargs): # Always run setup first on each segment, should have logic to not overwrite - adapter.setup(request) - adapter.refresh() + segments_adapter.setup(request) + segments_adapter.refresh() @hooks.register('before_serve_page')