fixes adapter issues and fixes block for segments adapter

2017-05-31 12:13:12 +02:00
parent 20011f079d
commit a78290281b
2 changed files with 6 additions and 4 deletions
--- a/src/wagtail_personalisation/adapters.py
+++ b/src/wagtail_personalisation/adapters.py
@ -97,8 +97,11 @@ class SessionSegmentsAdapter(BaseSegmentsAdapter):
        :rtype: wagtail_personalisation.models.Segment or None

        """
-        return next(item for item in self.request.session['segments']
-                    if item.id == segment_id)
+        try:
+            return next(item for item in self.request.session['segments']
+                        if item['id'] == segment_id)
+        except StopIteration:
+            return None

    def add(self, segment):
        """Add a segment to the request session.