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

Populate static segments even if the count is 0

Browse Source
This commit is contained in:
Kaitlyn Crawford
2018-02-26 14:31:56 +02:00
parent db2f82967e
commit d335e4fd7b
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/wagtail_personalisation/forms.py
View File

@ -2,12 +2,10 @@ from __future__ import absolute_import, unicode_literals
from datetime import datetime from datetime import datetime
from importlib import import_module from importlib import import_module
from itertools import takewhile
from django.conf import settings from django.conf import settings
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.contrib.auth.models import AnonymousUser from django.contrib.auth.models import AnonymousUser
from django.contrib.sessions.models import Session
from django.contrib.staticfiles.templatetags.staticfiles import static from django.contrib.staticfiles.templatetags.staticfiles import static
from django.test.client import RequestFactory from django.test.client import RequestFactory
from django.utils.lru_cache import lru_cache from django.utils.lru_cache import lru_cache
@ -108,7 +106,6 @@ class SegmentAdminForm(WagtailAdminModelForm):
users_to_add = [] users_to_add = []
users_to_exclude = [] users_to_exclude = []
# sessions = Session.objects.iterator()
User = get_user_model() User = get_user_model()
users = User.objects.filter(is_active=True, is_staff=False) users = User.objects.filter(is_active=True, is_staff=False)
@ -119,7 +116,7 @@ class SegmentAdminForm(WagtailAdminModelForm):
passes = adapter._test_rules(instance.get_rules(), request, instance.match_any) passes = adapter._test_rules(instance.get_rules(), request, instance.match_any)
if passes: if passes:
matched_count += 1 matched_count += 1
if len(users_to_add) <= instance.count: if instance.count == 0 or len(users_to_add) <= instance.count:
if instance.randomise_into_segment(): if instance.randomise_into_segment():
users_to_add.append(user) users_to_add.append(user)
else: else: