postmerge fixes

CHANGES

@@ -1,6 +1,6 @@
 0.13.0
 =================
- - Merged Praekolt fork
+ - Merged Praekelt fork
  - Add custom javascript to segment forms
  - bugfix:exclude variant returns queryset when params is queryset
  - Added RulePanel, a subclass of InlinePanel, for Rules
@@ -12,7 +12,7 @@
 
 0.12.0
 ==================
- - Merged forks of Torchbox and Praekolt
+ - Merged forks of Torchbox and Praekelt
  - Wagtail 2 compatibility
  - Makefile adjustments for portability
  - Adds simple segment forcing for superusers

src/wagtail_personalisation/models.py

@@ -22,8 +22,8 @@ from .forms import SegmentAdminForm
 
 class RulePanel(InlinePanel):
     def on_model_bound(self):
-        self.db_field = self.model._meta.get_field(
-            self.relation_name.replace('_related', 's'))
+        self.relation_name = self.relation_name.replace('_related', 's')
+        self.db_field = self.model._meta.get_field(self.relation_name)
         manager = getattr(self.model, self.relation_name)
         self.related = manager.rel
 

tests/settings.py

@@ -1,7 +1,4 @@
 import os
-from distutils.version import StrictVersion as V
-
-import django
 
 DATABASES = {
     'default': {
@@ -54,27 +51,17 @@ TEMPLATES = [
 ]
 
 
-def get_middleware_settings():
-    return (
+MIDDLEWARE = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-        'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 
     'wagtail.core.middleware.SiteMiddleware',
 )
 
-
-# Django 1.10 started to use "MIDDLEWARE" instead of "MIDDLEWARE_CLASSES".
-if V(django.get_version()) < V('1.10'):
-    MIDDLEWARE_CLASSES = get_middleware_settings()
-else:
-    MIDDLEWARE = get_middleware_settings()
-
-
 INSTALLED_APPS = (
     'wagtail_personalisation',
 

tests/unit/test_models.py

@@ -75,6 +75,6 @@ def test_sitemap_generation_for_variants_is_disabled(segmented_page):
 
 @pytest.mark.django_db
 def test_segment_edit_view(site, client, django_user_model):
-    test_segment = Segment()
+    test_segment = SegmentFactory()
     new_panel = test_segment.panels[1].children[0].bind_to_model(Segment)
     assert new_panel.related.name == "wagtail_personalisation_timerules"