Merge branch 'waldo' of git://github.com/melinath/philo into melinath

[philo.git] / models / pages.py

diff --git a/models/pages.py b/models/pages.py
index b9e481b..7476f18 100644 (file)
--- a/models/pages.py
+++ b/models/pages.py
@@ -43,9 +43,10 @@ class Template(TreeModel):
                                nodes = []
                                for node in nodelist:
                                        try:
                                nodes = []
                                for node in nodelist:
                                        try:

-                                               for nodelist_name in ('nodelist', 'nodelist_loop', 'nodelist_empty', 'nodelist_true', 'nodelist_false', 'nodelist_main'):
-                                                       if hasattr(node, nodelist_name):
-                                                               nodes.extend(nodelist_container_nodes(getattr(node, nodelist_name)))
+                                               if hasattr(node, 'child_nodelists'):
+                                                       for nodelist_name in node.child_nodelists:
+                                                               if hasattr(node, nodelist_name):
+                                                                       nodes.extend(nodelist_container_nodes(getattr(node, nodelist_name)))

                                                if isinstance(node, ContainerNode):
                                                        nodes.append(node)
                                                elif isinstance(node, ExtendsNode):
                                                if isinstance(node, ContainerNode):
                                                        nodes.append(node)
                                                elif isinstance(node, ExtendsNode):


@@ -75,7 +76,7 @@ class Template(TreeModel):
                return contentlet_node_names, contentreference_node_specs
        
        def __unicode__(self):
                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)
        
        @staticmethod
        @fattr(is_usable=True)


@@ -97,8 +98,17 @@ class Page(View):
        template = models.ForeignKey(Template, related_name='pages')
        title = models.CharField(max_length=255)
        
        template = models.ForeignKey(Template, related_name='pages')
        title = models.CharField(max_length=255)
        

-       def render_to_response(self, node, request, path=None, subpath=None):
-               return HttpResponse(self.template.django_template.render(RequestContext(request, {'page': self})), mimetype=self.template.mimetype)
+       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))
+       
+       def 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):
                return self.title
        
        def __unicode__(self):
                return self.title