Cavemanon/cavemanon-wagtail-personalisation
Archived
8
Fork 0
Code Issues Pull Requests Activity

Some eenie weenie fixes

Browse Source
This commit is contained in:
Jasper Berghoef
2016-11-10 09:27:26 +01:00
parent 42bfbbad62
commit 821dcccfcb
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/personalisation/middleware.py
View File

@@ -34,6 +34,7 @@ class SegmentMiddleware(object):
return response
def test_rules(self, rules, request):
"""Test wether the user matches a segment's rules'"""
if len(rules) > 0:
for rule in rules:
result = rule.test_user(request)
@@ -50,5 +51,5 @@ class SegmentMiddleware(object):
segment.visit_count = segment.visit_count + 1
segment.save()
if segment not in request.session['segments']:
if segment.encoded_name() not in request.session['segments']:
request.session['segments'].append(segment.encoded_name())

2
src/personalisation/static/personalisation/segment/index.css
View File

@@ -14,7 +14,7 @@
box-sizing: border-box;
position: relative;
width: calc(50% - 10px);
height: 126px;
min-height: 126px;
padding: 10px 20px;
margin-bottom: 20px;
border: 1px solid #d9d9d9;

4
src/personalisation/templates/modeladmin/personalisation/segment/index.html
View File

@@ -24,8 +24,8 @@
<div class="block">
<a href="inspect/{{ segment.pk }}"><h2>{{ segment }}</h2></a>
<ul class="segment_stats">
<li class="visit_stat">{{ segment.visit_count|localize }}</li>
<li class="days_stat">{{ segment.enable_date|days_since:segment.disable_date }}</li>
<li class="visit_stat">{{ segment.visit_count|localize }} visits</li>
<li class="days_stat">{{ segment.enable_date|days_since:segment.disable_date }} days</li>
</ul>
{% if user_can_create %}
<ul class="block_actions">

3
src/personalisation/templatetags/personalisation_filters.py
View File

@@ -3,11 +3,12 @@ from django.utils import timezone
register = Library()
@register.filter(name='days_since')
def active_days(enable_date, disable_date):
"""Returns the number of days the segment has been active"""
if enable_date is not None:
if disable_date is None or (disable_date < enable_date):
if disable_date is None or disable_date <= enable_date:
# There is no disable date, or it is not relevant.
delta = timezone.now() - enable_date
return delta.days