Merge branch 'gilbert' of git://github.com/lapilofu/philo into gilbert

[philo.git] / models / pages.py

diff --git a/models/pages.py b/models/pages.py
index 183b018..4260761 100644 (file)
--- a/models/pages.py
+++ b/models/pages.py
@@ -76,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)


@@ -98,6 +98,12 @@ 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 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 {})
        def render_to_string(self, node=None, request=None, path=None, subpath=None, extra_context=None):
                context = {}
                context.update(extra_context or {})


@@ -108,7 +114,7 @@ class Page(View):
                return self.template.django_template.render(Context(context))
        
        def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
                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, context), mimetype=self.template.mimetype)
+               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