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

rename base-class to reflect mixin nature

Browse Source
This commit is contained in:
Paul J Stevens
2017-05-31 13:47:54 +02:00
committed by Michael van Tellingen
parent 4e61ff0d08
commit f693e62bbf
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sandbox/sandbox/apps/home/models.py
View File

@@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals
from wagtail.wagtailcore.models import Page
from wagtail_personalisation.models import AbstractPersonalisablePage
from wagtail_personalisation.models import PersonalisablePageMixin
class HomePage(AbstractPersonalisablePage, Page):
class HomePage(PersonalisablePageMixin, Page):
pass

4
src/wagtail_personalisation/models.py
View File

@@ -82,7 +82,7 @@ class Segment(ClusterableModel):
return segment_rules
class AbstractPersonalisablePage(models.Model):
class PersonalisablePageMixin(models.Model):
"""The personalisable page model. Allows creation of variants with linked
segments.
@@ -159,4 +159,4 @@ def get_edit_handler(cls):
return edit_handler.bind_to_model(cls)
AbstractPersonalisablePage.get_edit_handler = get_edit_handler
PersonalisablePageMixin.get_edit_handler = get_edit_handler

4
src/wagtail_personalisation/views.py
View File

@@ -9,7 +9,7 @@ from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
from wagtail.contrib.modeladmin.views import IndexView
from wagtail.wagtailcore.models import Page
from wagtail_personalisation.models import AbstractPersonalisablePage, Segment
from wagtail_personalisation.models import PersonalisablePageMixin, Segment
class SegmentModelIndexView(IndexView):
@@ -123,7 +123,7 @@ def copy_page_view(request, page_id, segment_id):
:rtype: django.http.HttpResponseRedirect
"""
model = AbstractPersonalisablePage.get_model()
model = PersonalisablePageMixin.get_model()
if request.user.has_perm('wagtailadmin.access_admin'):
segment = get_object_or_404(Segment, pk=segment_id)
page = get_object_or_404(model, pk=page_id)

6
src/wagtail_personalisation/wagtail_hooks.py
View File

@@ -13,7 +13,7 @@ from wagtail.wagtailcore.models import Page
from wagtail_personalisation import admin_urls
from wagtail_personalisation.adapters import get_segment_adapter
from wagtail_personalisation.models import AbstractPersonalisablePage, Segment
from wagtail_personalisation.models import PersonalisablePageMixin, Segment
from wagtail_personalisation.utils import impersonate_other_page
logger = logging.getLogger(__name__)
@@ -109,7 +109,7 @@ def _check_for_variations(segments, page):
"""
try:
model = AbstractPersonalisablePage.__subclasses__()[0]
model = PersonalisablePageMixin.__subclasses__()[0]
except IndexError:
return
for segment in segments:
@@ -156,7 +156,7 @@ def page_listing_more_buttons(page, page_perms, is_parent=False):
"""
try:
model = AbstractPersonalisablePage.__subclasses__()[0]
model = PersonalisablePageMixin.__subclasses__()[0]
except IndexError:
return
segments = Segment.objects.all()

6
tests/sandbox/pages/models.py
View File

@@ -5,11 +5,11 @@ from wagtail.wagtailadmin.edit_handlers import FieldPanel
from wagtail.wagtailcore.fields import RichTextField
from wagtail.wagtailcore.models import Page
from wagtail_personalisation.models import AbstractPersonalisablePage
from wagtail_personalisation.models import PersonalisablePageMixin
class HomePage(AbstractPersonalisablePage, Page):
subtitle = models.CharField(max_length=255)
class HomePage(PersonalisablePageMixin, Page):
subtitle = models.CharField(max_length=255, blank=True, default='')
body = RichTextField(blank=True, default='')
content_panels = Page.content_panels + [