Stop using the request to store the rendered result of application contents

matthiask · matthiask · commit 2ed5c1969ba7 · 2011-02-22T19:38:39.000+01:00
diff --git a/feincms/content/application/models.py b/feincms/content/application/models.py
@@ -263,9 +263,6 @@ def __init__(self, *args, **kwargs):
         super(ApplicationContent, self).__init__(*args, **kwargs)
         self.app_config = self.ALL_APPS_CONFIG.get(self.urlconf_path, {}).get('config', {})
 
-    def render(self, request, **kwargs):
-        return getattr(request, "_feincms_applicationcontents", {}).get(self.id, u'')
-
     def process(self, request):
         page_url = self.parent.get_absolute_url()
 
@@ -318,15 +315,18 @@ def process(self, request):
         if isinstance(output, HttpResponse):
             if output.status_code == 200:
                 if not getattr(output, 'standalone', False):
-                    request._feincms_applicationcontents[self.id] = mark_safe(output.content.decode('utf-8'))
+                    self.rendered_result = mark_safe(output.content.decode('utf-8'))
                     # Copy relevant headers for later perusal
                     for h in ( 'Cache-Control', 'Last-Modified', 'Expires'):
                         if h in output:
                             request._feincms_applicationcontents_headers[h].append(output[h])
 
             return output
         else:
-            request._feincms_applicationcontents[self.id] = mark_safe(output)
+            self.rendered_result = mark_safe(output)
+
+    def render(self, request, **kwargs):
+        return self.rendered_result
 
     def save(self, *args, **kwargs):
         super(ApplicationContent, self).save(*args, **kwargs)
diff --git a/feincms/views/applicationcontent.py b/feincms/views/applicationcontent.py
@@ -26,8 +26,7 @@ def __call__(self, request, path=None):
 
     def prepare(self, request, page):
         # prepare storage for rendered application contents
-        if not hasattr(request, '_feincms_applicationcontents'):
-            request._feincms_applicationcontents = {}
+        if not hasattr(request, '_feincms_applicationcontents_headers'):
             request._feincms_applicationcontents_headers = defaultdict(list)
 
         # Used to provide additional app-specific context variables:
