diff --git a/src/personalisation/migrations/0001_initial.py b/src/personalisation/migrations/0001_initial.py index efbbf47..8e11e2c 100644 --- a/src/personalisation/migrations/0001_initial.py +++ b/src/personalisation/migrations/0001_initial.py @@ -2,9 +2,9 @@ # Generated by Django 1.10.3 on 2016-12-05 07:48 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion import modelcluster.fields +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/personalisation/migrations/0002_auto_20161205_1623.py b/src/personalisation/migrations/0002_auto_20161205_1623.py index 2636430..893d647 100644 --- a/src/personalisation/migrations/0002_auto_20161205_1623.py +++ b/src/personalisation/migrations/0002_auto_20161205_1623.py @@ -2,9 +2,9 @@ # Generated by Django 1.10.1 on 2016-12-05 16:23 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion import modelcluster.fields +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/personalisation/models.py b/src/personalisation/models.py index 46ad4d9..22e6cff 100644 --- a/src/personalisation/models.py +++ b/src/personalisation/models.py @@ -1,13 +1,13 @@ from __future__ import absolute_import, unicode_literals -from datetime import datetime import re +from datetime import datetime from django.db import models from django.db.models import Q -from django.utils import timezone from django.db.models.signals import pre_save from django.template.defaultfilters import slugify +from django.utils import timezone from django.utils.encoding import python_2_unicode_compatible from django.utils.functional import cached_property from django.utils.translation import ugettext_lazy as _ @@ -380,4 +380,3 @@ def get_edit_handler(cls): PersonalisablePage.get_edit_handler = get_edit_handler - diff --git a/src/personalisation/views.py b/src/personalisation/views.py index fa1ac8d..ddd56c4 100644 --- a/src/personalisation/views.py +++ b/src/personalisation/views.py @@ -6,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _ from wagtail.contrib.modeladmin.views import CreateView from personalisation.forms import SegmentForm -from personalisation.models import Segment, PersonalisablePage +from personalisation.models import PersonalisablePage, Segment def enable(request, segment_id): @@ -56,4 +56,3 @@ def copy_page_view(request, page_id, segment_id): edit_url = reverse('wagtailadmin_pages:edit', args=[new_page.id]) return HttpResponseRedirect(edit_url) - diff --git a/src/personalisation/wagtail_hooks.py b/src/personalisation/wagtail_hooks.py index 1f44bb7..dcba5e2 100644 --- a/src/personalisation/wagtail_hooks.py +++ b/src/personalisation/wagtail_hooks.py @@ -1,10 +1,9 @@ -import time import logging +import time - -from django.shortcuts import reverse from django.conf.urls import include, url from django.core.urlresolvers import reverse +from django.shortcuts import reverse from django.utils.translation import ugettext_lazy as _ from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register from wagtail.contrib.modeladmin.views import IndexView @@ -13,7 +12,8 @@ from wagtail.wagtailadmin.widgets import ( from wagtail.wagtailcore import hooks from personalisation import admin_urls -from personalisation.models import AbstractBaseRule, PersonalisablePage, Segment +from personalisation.models import ( + AbstractBaseRule, PersonalisablePage, Segment) from personalisation.utils import impersonate_other_page logger = logging.getLogger() @@ -198,7 +198,7 @@ def page_listing_more_buttons(page, page_perms, is_parent=False): segments = Segment.objects.all() current_page = PersonalisablePage.objects.filter(pk=page.pk) available_segments = [item for item in segments if not PersonalisablePage.objects.filter(segment=item)] - + for segment in available_segments: yield Button(segment.name, reverse('segment:copy_page', args=[page.id, segment.id]), attrs={"title": _('Create this variant')}) diff --git a/tests/unit/test_middleware.py b/tests/unit/test_middleware.py index 1eaee9e..0b0bb1d 100644 --- a/tests/unit/test_middleware.py +++ b/tests/unit/test_middleware.py @@ -6,8 +6,8 @@ from freezegun import freeze_time from wagtail.wagtailcore.models import Page from tests.factories.segment import ( - ReferralRuleFactory, SegmentFactory, - TimeRuleFactory, VisitCountRuleFactory, QueryRuleFactory) + QueryRuleFactory, ReferralRuleFactory, SegmentFactory, TimeRuleFactory, + VisitCountRuleFactory) from tests.factories.site import SiteFactory