Added view_about_to_render and view_finished_rendering signals. Added hidden _render_...

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 621dc65..3791e55 100644 (file)
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -388,9 +388,9 @@ class NewsletterView(MultiView, FeedMultiViewMixin):
                        article = articles.get(slug=slug)
                except:
                        raise Http404
-               context = {}
+               context = self.get_context()
                context.update(extra_context or {})
-               context.update({'newsletter': self.newsletter, 'article': article})
+               context.update({'article': article})
                return self.article_page.render_to_response(node, request, extra_context=context)
        
        def issue_archive_view(self, request, node=None, extra_context=None):

diff --git a/models/nodes.py b/models/nodes.py
index 23be42b..b633542 100644 (file)
--- a/models/nodes.py
+++ b/models/nodes.py
@@ -11,6 +11,7 @@ from philo.models.base import TreeEntity, Entity, QuerySetMapper, register_value
 from philo.utils import ContentTypeSubclassLimiter
 from philo.validators import RedirectValidator
 from philo.exceptions import ViewDoesNotProvideSubpaths, AncestorDoesNotExist
+from philo.signals import view_about_to_render, view_finished_rendering
 
 
 _view_content_type_limiter = ContentTypeSubclassLimiter(None)
@@ -28,7 +29,7 @@ class Node(TreeEntity):
                return False
        
        def render_to_response(self, request, path=None, subpath=None, extra_context=None):
-               return self.view.render_to_response(self, request, path, subpath, extra_context)
+               return self.view._render_to_response(self, request, path, subpath, extra_context)
        
        def get_absolute_url(self):
                root = Site.objects.get_current().root_node
@@ -59,6 +60,13 @@ class View(Entity):
        def relationships_with_node(self, node):
                return QuerySetMapper(self.relationship_set, passthrough=node.relationships)
        
+       def _render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+               extra_context = extra_context or {}
+               view_about_to_render.send(sender=self, node=node, request=request, path=path, subpath=subpath, extra_context=extra_context)
+               response = self.render_to_response(node, request, path, subpath, extra_context)
+               view_finished_rendering.send(sender=self, response=response)
+               return response
+       
        def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
                raise NotImplementedError('View subclasses must implement render_to_response.')
        

diff --git a/signals.py b/signals.py
index e76f319..372eb1b 100644 (file)
--- a/signals.py
+++ b/signals.py
@@ -1,3 +1,6 @@
 from django.dispatch import Signal
 
-entity_class_prepared = Signal(providing_args=['class'])
\ No newline at end of file
+
+entity_class_prepared = Signal(providing_args=['class'])
+view_about_to_render = Signal(providing_args=['node', 'request', 'path', 'subpath', 'extra_context'])
+view_finished_rendering = Signal(providing_args=['response'])
\ No newline at end of file