X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/e877b2e3808010dba06a2e3a9830c176a1c10a54..62dd9e5158192a70f6b1ecef5eb9e85524f175c6:/models/pages.py diff --git a/models/pages.py b/models/pages.py index 5f75494..4260761 100644 --- 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 self.get_path(u' › ', 'name') + return self.get_path(pathsep=u' › ', field='name') @staticmethod @fattr(is_usable=True) @@ -98,11 +98,23 @@ class Page(View): template = models.ForeignKey(Template, related_name='pages') title = models.CharField(max_length=255) - def render_to_response(self, node, request, path=None, subpath=None, extra_context=None): + 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_with_node(node), 'relationships': self.relationships_with_node(node)}) - return HttpResponse(self.template.django_template.render(RequestContext(request, context)), mimetype=self.template.mimetype) + 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