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

Work in progress

Browse Source
This commit is contained in:
Jasper Berghoef
2017-05-31 15:28:23 +02:00
committed by Michael van Tellingen
parent 9605773a74
commit cb03a36ba2
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wagtail_personalisation/models.py
View File

@ -1,4 +1,5 @@
from __future__ import absolute_import, unicode_literals from __future__ import absolute_import, unicode_literals
import itertools
from django.db import models, transaction from django.db import models, transaction
from django.template.defaultfilters import slugify from django.template.defaultfilters import slugify
@ -80,11 +81,10 @@ class Segment(ClusterableModel):
def get_rules(self): def get_rules(self):
"""Retrieve all rules in the segment.""" """Retrieve all rules in the segment."""
segment_rules = [] related_rules = [rule.objects.filter(segment=self)
for rule_model in AbstractBaseRule.get_descendant_models(): for rule in AbstractBaseRule.__subclasses__()]
segment_rules.extend(
rule_model._default_manager.filter(segment=self)) return list(itertools.chain(*related_rules))
return segment_rules
def toggle(self, save=True): def toggle(self, save=True):
self.status = ( self.status = (

10
src/wagtail_personalisation/views.py
View File

@ -39,7 +39,7 @@ class SegmentModelAdmin(ModelAdmin):
dashboard_view_class = SegmentModelDashboardView dashboard_view_class = SegmentModelDashboardView
menu_icon = 'fa-snowflake-o' menu_icon = 'fa-snowflake-o'
add_to_settings_menu = False add_to_settings_menu = False
list_display = ('name', 'visits', 'active_days', 'status') list_display = ('name', 'persistent', 'match_any', 'status', 'statistics')
index_view_extra_js = ['js/commons.js', 'js/index.js'] index_view_extra_js = ['js/commons.js', 'js/index.js']
index_view_extra_css = ['css/index.css'] index_view_extra_css = ['css/index.css']
form_view_extra_js = ['js/commons.js', 'js/form.js'] form_view_extra_js = ['js/commons.js', 'js/form.js']
@ -55,11 +55,9 @@ class SegmentModelAdmin(ModelAdmin):
return view_class.as_view(**kwargs)(request) return view_class.as_view(**kwargs)(request)
def visits(self, obj): def statistics(self, obj):
return _("{visits} visits").format(visits=obj.visit_count) return _("{visits} visits in {days} days").format(
visits=obj.visit_count, days=obj.get_active_days())
def active_days(self, obj):
return _("{days} days").format(days=obj.get_active_days())
def toggle_segment_view(request): def toggle_segment_view(request):