7

Merge branch 'master' of github.com:LabD/wagtail-personalisation

This commit is contained in:
Boris Besemer
2016-12-05 15:29:29 +01:00
2 changed files with 5 additions and 6 deletions

View File

@ -21,8 +21,7 @@ class SegmentMiddleware(object):
if 'visit_count' not in request.session: if 'visit_count' not in request.session:
request.session['visit_count'] = [] request.session['visit_count'] = []
if 'segments' not in request.session: request.session['segments'] = []
request.session['segments'] = []
if any(request.path.startswith(item) for item in reverse_urls): if any(request.path.startswith(item) for item in reverse_urls):
return self.get_response(request) return self.get_response(request)

View File

@ -44,12 +44,12 @@ def set_visit_count(page, request, serve_args, serve_kwargs):
segment.save() segment.save()
# Update the page visit count # Update the page visit count
def create_new_counter(page): def create_new_counter(page, request):
"""Create a new counter dict and place it in session storage.""" """Create a new counter dict and place it in session storage."""
countdict = { countdict = {
"slug": page.slug, "slug": page.slug,
"id": page.pk, "id": page.pk,
"path": page.url, "path": request.path,
"count": 1, "count": 1,
} }
request.session['visit_count'].append(countdict) request.session['visit_count'].append(countdict)
@ -63,10 +63,10 @@ def set_visit_count(page, request, serve_args, serve_kwargs):
request.session.modified = True request.session.modified = True
else: else:
# Counter doesn't exist. Create a new counter with count value 1. # Counter doesn't exist. Create a new counter with count value 1.
create_new_counter(page) create_new_counter(page, request)
else: else:
# No counters exist. Create a new counter with count value 1. # No counters exist. Create a new counter with count value 1.
create_new_counter(page) create_new_counter(page, request)
@hooks.register('before_serve_page') @hooks.register('before_serve_page')
def serve_variation(page, request, serve_args, serve_kwargs): def serve_variation(page, request, serve_args, serve_kwargs):