Implemented better container filtering for page container inlines.

[philo.git] / models / pages.py

diff --git a/models/pages.py b/models/pages.py
index 9d02c79..e000b1b 100644 (file)
--- a/models/pages.py
+++ b/models/pages.py
@@ -14,12 +14,13 @@ from philo.models.base import TreeModel, register_value_model
 from philo.models.nodes import View
 from philo.utils import fattr
 from philo.templatetags.containers import ContainerNode
+from philo.signals import page_about_to_render_to_string, page_finished_rendering_to_string
 
 
 class Template(TreeModel):
        name = models.CharField(max_length=255)
        documentation = models.TextField(null=True, blank=True)
-       mimetype = models.CharField(max_length=255, null=True, blank=True, help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE)
+       mimetype = models.CharField(max_length=255, default=getattr(settings, 'DEFAULT_CONTENT_TYPE', 'text/html'))
        code = models.TextField(verbose_name='django template code')
        
        @property
@@ -76,7 +77,7 @@ class Template(TreeModel):
                return contentlet_node_names, contentreference_node_specs
        
        def __unicode__(self):
-               return self.get_path(u' › ', 'name')
+               return self.get_path(pathsep=u' › ', field='name')
        
        @staticmethod
        @fattr(is_usable=True)
@@ -98,16 +99,27 @@ class Page(View):
        template = models.ForeignKey(Template, related_name='pages')
        title = models.CharField(max_length=255)
        
+       def get_containers(self):
+               if not hasattr(self, '_containers'):
+                       self._containers = self.template.containers
+               return self._containers
+       containers = property(get_containers)
+       
        def render_to_string(self, node=None, request=None, path=None, subpath=None, extra_context=None):
                context = {}
                context.update(extra_context or {})
                context.update({'page': self, 'attributes': self.attributes, 'relationships': self.relationships})
                if node and request:
                        context.update({'node': node, 'attributes': self.attributes_with_node(node), 'relationships': self.relationships_with_node(node)})
-                       return self.template.django_template.render(RequestContext(request, context))
-               return self.template.django_template.render(Context(context))
+                       page_about_to_render_to_string.send(sender=self, node=node, request=request, extra_context=context)
+                       string = self.template.django_template.render(RequestContext(request, context))
+               else:
+                       page_about_to_render_to_string.send(sender=self, node=node, request=request, extra_context=context)
+                       string = self.template.django_template.render(Context(context))
+               page_finished_rendering_to_string.send(sender=self, string=string)
+               return string
        
-       def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+       def actually_render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
                return HttpResponse(self.render_to_string(node, request, path, subpath, extra_context), mimetype=self.template.mimetype)
        
        def __unicode__(self):