From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Wed, 11 Aug 2010 20:14:07 +0000 (-0400)
Subject: Merge branch 'node_absolute_urls' of git://github.com/melinath/philo
X-Git-Tag: philo-0.9~40
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/781cf86e935c66069acd17878a9f3de7cc6ec231?hp=-c

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

* 'node_absolute_urls' of git://github.com/melinath/philo:
  Implements get_absolute_url for nodes (Feature #17). Fixes that mysterious 'name' bug. ;-)
---

781cf86e935c66069acd17878a9f3de7cc6ec231
diff --combined models/pages.py
index 9d02c79,ed55ca5..7476f18
--- a/models/pages.py
+++ b/models/pages.py
@@@ -76,7 -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,17 -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