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

Rename PersonalisablePageMixin.personalisable_metadata

Browse Source 
Use PersonalisablePageMixin.personalisation_metadata instead to mirror
the package name
This commit is contained in:
Michael van Tellingen
2017-06-02 10:23:46 +02:00
parent 282baa4787
commit 5aa754dd80
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wagtail_personalisation/models.py
View File

@ -187,7 +187,7 @@ class PersonalisablePageMixin(object):
""" """
@cached_property @cached_property
def personalisable_metadata(self): def personalisation_metadata(self):
try: try:
metadata = self._personalisable_page_metadata metadata = self._personalisable_page_metadata
except AttributeError: except AttributeError:

4
src/wagtail_personalisation/wagtail_hooks.py
View File

@ -78,7 +78,7 @@ def serve_variation(page, request, serve_args, serve_kwargs):
user_segments = adapter.get_segments() user_segments = adapter.get_segments()
if user_segments: if user_segments:
metadata = page.personalisable_metadata metadata = page.personalisation_metadata
# TODO: This is never more then one page? (fix query count) # TODO: This is never more then one page? (fix query count)
variations = metadata.variants_for_segments(user_segments) variations = metadata.variants_for_segments(user_segments)
@ -96,7 +96,7 @@ def page_listing_variant_buttons(page, page_perms, is_parent=False):
if not isinstance(page, models.PersonalisablePageMixin): if not isinstance(page, models.PersonalisablePageMixin):
return return
metadata = page.personalisable_metadata metadata = page.personalisation_metadata
if metadata.is_canonical and metadata.get_unused_segments(): if metadata.is_canonical and metadata.get_unused_segments():
yield ButtonWithDropdownFromHook( yield ButtonWithDropdownFromHook(
_('Variants'), _('Variants'),

2
tests/fixtures.py
View File

@ -25,7 +25,7 @@ def site():
def segmented_page(site): def segmented_page(site):
page = ContentPageFactory(parent=site.root_page, slug='personalised') page = ContentPageFactory(parent=site.root_page, slug='personalised')
segment = SegmentFactory() segment = SegmentFactory()
return page.personalisable_metadata.copy_for_segment(segment) return page.personalisation_metadata.copy_for_segment(segment)
@pytest.fixture() @pytest.fixture()

10
tests/unit/test_models.py
View File

@ -19,9 +19,9 @@ def test_segment_create():
@pytest.mark.django_db @pytest.mark.django_db
def test_metadata_page_has_variations(segmented_page): def test_metadata_page_has_variations(segmented_page):
assert not segmented_page.personalisable_metadata.is_canonical assert not segmented_page.personalisation_metadata.is_canonical
assert not segmented_page.personalisable_metadata.has_variations assert not segmented_page.personalisation_metadata.has_variations
canonical = segmented_page.personalisable_metadata.canonical_page canonical = segmented_page.personalisation_metadata.canonical_page
assert canonical.personalisable_metadata.is_canonical assert canonical.personalisation_metadata.is_canonical
assert canonical.personalisable_metadata.has_variations assert canonical.personalisation_metadata.has_variations

6
tests/unit/test_wagtail_hooks.py
View File

@ -20,7 +20,7 @@ def test_serve_variation_with_variant_no_segment(site, rf, segmented_page):
args = tuple() args = tuple()
kwargs = {} kwargs = {}
page = segmented_page.personalisable_metadata.canonical_page page = segmented_page.personalisation_metadata.canonical_page
result = wagtail_hooks.serve_variation(page, request, args, kwargs) result = wagtail_hooks.serve_variation(page, request, args, kwargs)
assert result is None assert result is None
@ -31,8 +31,8 @@ def test_serve_variation_with_variant_segmented(site, rf, segmented_page):
args = tuple() args = tuple()
kwargs = {} kwargs = {}
page = segmented_page.personalisable_metadata.canonical_page page = segmented_page.personalisation_metadata.canonical_page
segment = segmented_page.personalisable_metadata.segment segment = segmented_page.personalisation_metadata.segment
adapter = adapters.get_segment_adapter(request) adapter = adapters.get_segment_adapter(request)
adapter.set_segments([segment]) adapter.set_segments([segment])