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

Small improvements and item fix

Browse Source
This commit is contained in:
Jasper Berghoef
2017-06-08 08:41:04 +02:00
parent 80e33a467e
commit fb7ed4936d
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/wagtail_personalisation/wagtail_hooks.py
View File

@ -93,8 +93,11 @@ def serve_variant(page, request, serve_args, serve_kwargs):
@hooks.register('construct_explorer_page_queryset') @hooks.register('construct_explorer_page_queryset')
def dont_show_variant(parent_page, pages, request): def dont_show_variant(parent_page, pages, request):
return [page for page in pages return [page for page in pages
if (page.personalisation_metadata is None) if (hasattr(page, 'personalisation_metadata') is False)
or (page.personalisation_metadata.is_canonical)] or (hasattr(page, 'personalisation_metadata')
and page.personalisation_metadata is None)
or (hasattr(page, 'personalisation_metadata')
and page.personalisation_metadata.is_canonical)]
@hooks.register('register_page_listing_buttons') @hooks.register('register_page_listing_buttons')
@ -154,12 +157,12 @@ class CorrectedPagesSummaryPanel(PagesSummaryItem):
def get_context(self): def get_context(self):
context = super(CorrectedPagesSummaryPanel, self).get_context() context = super(CorrectedPagesSummaryPanel, self).get_context()
pages = [page for page in Page.objects.all() pages = [page for page in Page.objects.all().specific()
if (hasattr(page.specific, 'personalisation_metadata') is False) if (hasattr(page, 'personalisation_metadata') is False)
or (hasattr(page.specific, 'personalisation_metadata') or (hasattr(page, 'personalisation_metadata')
and page.specific.personalisation_metadata is None) and page.personalisation_metadata is None)
or (hasattr(page.specific, 'personalisation_metadata') or (hasattr(page, 'personalisation_metadata')
and page.specific.personalisation_metadata.is_canonical)] and page.personalisation_metadata.is_canonical)]
context['total_pages'] = len(pages) - 1 context['total_pages'] = len(pages) - 1
return context return context
@ -208,7 +211,7 @@ class VariantPagesSummaryPanel(PagesSummaryItem):
def render(self): def render(self):
page_count = PersonalisablePageMetadata.objects\ page_count = PersonalisablePageMetadata.objects\
.filter(segment__isnull=True).count() .filter(segment__isnull=False).count()
title = _("Variant") title = _("Variant")
return mark_safe(""" return mark_safe("""
<li class="icon icon-fa-files-o"> <li class="icon icon-fa-files-o">