diff --git a/sandbox/exampledata/personalisation.json b/sandbox/exampledata/personalisation.json index 93205e5..8565ddc 100644 --- a/sandbox/exampledata/personalisation.json +++ b/sandbox/exampledata/personalisation.json @@ -25,7 +25,7 @@ "enable_date": "2017-06-02T10:58:39.389Z", "disable_date": "2017-06-02T10:34:51.722Z", "visit_count": 0, - "status": "enabled", + "enabled": true, "persistent": false, "match_any": false } @@ -39,7 +39,7 @@ "enable_date": "2017-06-02T10:57:44.497Z", "disable_date": "2017-06-02T10:57:39.984Z", "visit_count": 1, - "status": "enabled", + "enabled": true, "persistent": false, "match_any": false } diff --git a/src/wagtail_personalisation/migrations/0013_auto_20170609_1321.py b/src/wagtail_personalisation/migrations/0013_auto_20170609_1321.py new file mode 100644 index 0000000..8377d02 --- /dev/null +++ b/src/wagtail_personalisation/migrations/0013_auto_20170609_1321.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.2 on 2017-06-09 13:21 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtail_personalisation', '0012_remove_personalisablepagemetadata_is_segmented'), + ] + + operations = [ + migrations.RemoveField( + model_name='segment', + name='status', + ), + migrations.AddField( + model_name='segment', + name='enabled', + field=models.BooleanField(default=True, help_text='Should the segment be active?'), + ), + ] diff --git a/src/wagtail_personalisation/models.py b/src/wagtail_personalisation/models.py index ec0c83f..3fce625 100644 --- a/src/wagtail_personalisation/models.py +++ b/src/wagtail_personalisation/models.py @@ -22,20 +22,12 @@ from .forms import SegmentAdminForm class SegmentQuerySet(models.QuerySet): def enabled(self): - return self.filter(status=self.model.STATUS_ENABLED) + return self.filter(enabled=True) @python_2_unicode_compatible class Segment(ClusterableModel): """The segment model.""" - STATUS_ENABLED = 'enabled' - STATUS_DISABLED = 'disabled' - - STATUS_CHOICES = ( - (STATUS_ENABLED, _('Enabled')), - (STATUS_DISABLED, _('Disabled')), - ) - TYPE_DYNAMIC = 'dynamic' TYPE_STATIC = 'static' @@ -50,8 +42,8 @@ class Segment(ClusterableModel): enable_date = models.DateTimeField(null=True, editable=False) disable_date = models.DateTimeField(null=True, editable=False) visit_count = models.PositiveIntegerField(default=0, editable=False) - status = models.CharField( - max_length=20, choices=STATUS_CHOICES, default=STATUS_ENABLED) + enabled = models.BooleanField( + default=True, help_text=_("Should the segment be active?")) persistent = models.BooleanField( default=False, help_text=_("Should the segment persist between visits?")) match_any = models.BooleanField( @@ -111,7 +103,7 @@ class Segment(ClusterableModel): MultiFieldPanel([ FieldPanel('name', classname="title"), FieldRowPanel([ - FieldPanel('status'), + FieldPanel('enabled'), FieldPanel('persistent'), ]), FieldPanel('match_any'), @@ -178,9 +170,9 @@ class Segment(ClusterableModel): return segment_rules def toggle(self, save=True): - self.status = ( - self.STATUS_ENABLED if self.status == self.STATUS_DISABLED - else self.STATUS_DISABLED) + self.enabled = ( + True if self.enabled == False + else False) if save: self.save() diff --git a/src/wagtail_personalisation/receivers.py b/src/wagtail_personalisation/receivers.py index 722f09d..e5c7fad 100644 --- a/src/wagtail_personalisation/receivers.py +++ b/src/wagtail_personalisation/receivers.py @@ -7,16 +7,16 @@ from wagtail_personalisation.models import Segment def check_status_change(sender, instance, *args, **kwargs): """Check if the status has changed. Alter dates accordingly.""" try: - original_status = sender.objects.get(pk=instance.id).status + original_status = sender.objects.get(pk=instance.id).enabled except sender.DoesNotExist: - original_status = "" + original_status = None - if original_status != instance.status: - if instance.status == instance.STATUS_ENABLED: + if original_status != instance.enabled: + if instance.enabled == True: instance.enable_date = timezone.now() instance.visit_count = 0 return instance - if instance.status == instance.STATUS_DISABLED: + if instance.enabled == False: instance.disable_date = timezone.now() diff --git a/src/wagtail_personalisation/templates/modeladmin/wagtail_personalisation/segment/dashboard.html b/src/wagtail_personalisation/templates/modeladmin/wagtail_personalisation/segment/dashboard.html index 0e24ba1..547e14b 100644 --- a/src/wagtail_personalisation/templates/modeladmin/wagtail_personalisation/segment/dashboard.html +++ b/src/wagtail_personalisation/templates/modeladmin/wagtail_personalisation/segment/dashboard.html @@ -22,7 +22,7 @@
{% if all_count %} {% for segment in object_list %} -
+

{{ segment }}

@@ -98,10 +98,10 @@ {% if user_can_create %}
    - {% if segment.status == segment.STATUS_DISABLED %} -
  • enable
    • - {% elif segment.status == segment.STATUS_ENABLED %} + {% if segment.enabled %}
  • disable
    • + {% else %} +
  • enable
    • {% endif %}
  • configure this
    • {% if segment.is_static %} diff --git a/src/wagtail_personalisation/views.py b/src/wagtail_personalisation/views.py index de421a4..65bed88 100644 --- a/src/wagtail_personalisation/views.py +++ b/src/wagtail_personalisation/views.py @@ -83,7 +83,7 @@ class SegmentModelAdmin(ModelAdmin): delete_view_class = SegmentModelDeleteView menu_icon = 'fa-snowflake-o' add_to_settings_menu = False - list_display = ('name', 'persistent', 'match_any', 'status', + list_display = ('name', 'persistent', 'match_any', 'enabled', 'page_count', 'variant_count', 'statistics') index_view_extra_js = ['js/commons.js', 'js/index.js'] index_view_extra_css = ['css/index.css'] diff --git a/tests/factories/segment.py b/tests/factories/segment.py index f92f579..2b47206 100644 --- a/tests/factories/segment.py +++ b/tests/factories/segment.py @@ -7,7 +7,7 @@ from wagtail_personalisation import models class SegmentFactory(factory.DjangoModelFactory): name = 'TestSegment' - status = models.Segment.STATUS_ENABLED + enabled = True class Meta: model = models.Segment diff --git a/tests/unit/test_adapter_session.py b/tests/unit/test_adapter_session.py index 191b20a..3b123c1 100644 --- a/tests/unit/test_adapter_session.py +++ b/tests/unit/test_adapter_session.py @@ -64,7 +64,7 @@ def test_refresh_removes_disabled(rf): adapter.set_segments([segment_1, segment_2]) adapter = adapters.SessionSegmentsAdapter(request) - segment_1.status = segment_1.STATUS_DISABLED + segment_1.enabled = False segment_1.save() adapter.refresh() diff --git a/tests/unit/test_factories.py b/tests/unit/test_factories.py index d82efba..cacebe2 100644 --- a/tests/unit/test_factories.py +++ b/tests/unit/test_factories.py @@ -15,14 +15,14 @@ from wagtail_personalisation.rules import TimeRule @pytest.mark.django_db def test_segment_create(): factoried_segment = SegmentFactory() - segment = Segment(name='TestSegment', status='enabled') + segment = Segment(name='TestSegment', enabled='enabled') TimeRule( start_time=datetime.time(8, 0, 0), end_time=datetime.time(23, 0, 0), segment=segment) assert factoried_segment.name == segment.name - assert factoried_segment.status == segment.status + assert factoried_segment.enabled == segment.enabled @pytest.mark.django_db