X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/2380185d894e5a62a20b91a0c5a3a48497fb3cfb..60a1df9c4f1df657cee19951a87f781b0e2bf85a:/models/pages.py?ds=sidebyside diff --git a/models/pages.py b/models/pages.py index ff8e876..7476f18 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,17 @@ 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 render_to_string(self, node=None, request=None, path=None, subpath=None, extra_context=None): context = {} context.update(extra_context or {}) - context.update({'node': node, '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