#287 Use global context for display organization (#288)

Author: duker33

pages/display.py

@@ -5,6 +5,8 @@
 """
 import typing
 
+from collections import defaultdict
+
 
 class Page:
     """It's python Descriptor."""
@@ -20,14 +22,19 @@ def __init__(self, page: 'pages.models.Page'=None, context: typing.Dict[str, typ
         because client code wants the same context for many different cases.
         """
         self._page = page
-        self._context = context or {}
+        self._global_context = defaultdict(dict)
+        if context:
+            self._global_context[page.id] = context
 
     def __get__(self, instance: 'pages.models.Page', type_):
-        return Page(instance, {'page': instance, **self._context})
+        return Page(
+            instance,
+            {'page': instance, **self._global_context[instance.id]}
+        )
 
     def __set__(self, instance: 'pages.models.Page', value: typing.Dict[str, typing.Any]):
         self._page = instance
-        self._context = value
+        self._global_context[instance.id] = value
 
     def __getattr__(self, item):
         if item in self.STORED:
@@ -37,7 +44,9 @@ def __getattr__(self, item):
 
     def render(self, field: str):
         return (
-            self._page.template.render_field(field, self._context)
+            self._page.template.render_field(
+                field, context=self._global_context[self._page.id]
+            )
             if self._page.template
             else getattr(self._page, field)
         )

tests/pages/test_models.py

@@ -1,5 +1,3 @@
-import unittest
-
 from django.test import TestCase
 
 from pages.models import ModelPage, CustomPage, FlatPage, Page, PageTemplate
@@ -136,7 +134,6 @@ def test_display_attribute_uses_template(self):
 
     # @todo #SE742:30m  Fix display issue with shared context.
     #  See the test below for details.
-    @unittest.expectedFailure
     def test_display_has_unique_context(self):
         """Two different pages should contain not overlapping display contexts."""
         left_template = PageTemplate.objects.create(name='left', h1='{{ tag }}')