Merge pull request #176 from tm-kn/fix-excluding-pages-without-variant

Fix excluding pages without variant
wagtail · May 30, 2018 · 9919d76 · 9919d76
2 parents 65a46f2 + 6514bc1
commit 9919d76
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/wagtail_personalisation/utils.py b/src/wagtail_personalisation/utils.py
@@ -104,6 +104,8 @@ def exclude_variants(pages):
     :return: Queryset of pages that aren't variants
     :rtype: QuerySet
     """
-    return pages.filter(
-        personalisable_canonical_metadata__canonical_page_id=F(
-            'personalisable_canonical_metadata__variant__id'))
+    from wagtail_personalisation.models import PersonalisablePageMetadata
+    excluded_variant_pages = PersonalisablePageMetadata.objects.exclude(
+        canonical_page_id=F('variant_id')
+    ).values_list('variant_id')
+    return pages.exclude(pk__in=excluded_variant_pages)