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

removes related prefetch

Browse Source
This commit is contained in:
Boris Besemer
2017-01-10 12:37:36 +01:00
parent 3e6302ca03
commit cf946f2bee
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/personalisation/adapters.py
View File

@ -74,13 +74,13 @@ class SessionSegmentsAdapter(BaseSegmentsAdapter):
self.request.session['segments'] = current_segments self.request.session['segments'] = current_segments
segments = Segment.objects.filter(status='enabled').prefetch_related('rules') segments = Segment.objects.filter(status='enabled')
for segment in segments: for segment in segments:
rules = AbstractBaseRule.__subclasses__() rules = AbstractBaseRule.__subclasses__()
segment_rules = [] segment_rules = []
for rule in rules: for rule in rules:
segment_rules += segments.rules.filter(segment=segment, pk=rule.pk) segment_rules += rule.objects.filter(segment=segment)
result = self._test_rules(segment_rules, self.request) result = self._test_rules(segment_rules, self.request)
if result: if result:

3
src/personalisation/models.py
View File

@ -183,7 +183,6 @@ class QueryRule(AbstractBaseRule):
@python_2_unicode_compatible @python_2_unicode_compatible
class UserIsLoggedInRule(AbstractBaseRule): class UserIsLoggedInRule(AbstractBaseRule):
"""User should be logged in""" """User should be logged in"""
is_logged_in = models.BooleanField(default=False) is_logged_in = models.BooleanField(default=False)
panels = [ panels = [
@ -337,7 +336,7 @@ class PersonalisablePage(Page):
return not self.canonical_page and self.has_variations return not self.canonical_page and self.has_variations
@cached_classmethod @cached_classmethodx
def get_edit_handler(cls): def get_edit_handler(cls):
tabs = [] tabs = []
if cls.content_panels: if cls.content_panels:

2
tests/unit/test_middleware.py
View File

@ -227,6 +227,8 @@ class TestUserSegmenting(object):
) )
client.get('/?test=test') client.get('/?test=test')
import pdb
pdb.set_trace()
assert any(item['encoded_name'] == 'match-any' for item in client.session['segments']) assert any(item['encoded_name'] == 'match-any' for item in client.session['segments'])