From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Wed, 1 Jun 2011 21:50:47 +0000 (-0400)
Subject: Merge branch 'release' into develop
X-Git-Tag: philo-0.9.1^2~8^2~9
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/ac54db264df3ba87306945a5494bd89e38266c38?hp=-c

Merge branch 'release' into develop
---

ac54db264df3ba87306945a5494bd89e38266c38
diff --combined philo/models/nodes.py
index 6eeb965,5de7338..ab3bca5
--- a/philo/models/nodes.py
+++ b/philo/models/nodes.py
@@@ -11,7 -11,7 +11,7 @@@ from django.http import HttpResponse, H
  from django.utils.encoding import smart_str
  
  from philo.exceptions import MIDDLEWARE_NOT_CONFIGURED, ViewCanNotProvideSubpath, ViewDoesNotProvideSubpaths
- from philo.models.base import TreeEntity, Entity, register_value_model
+ from philo.models.base import SlugTreeEntity, Entity, register_value_model
  from philo.models.fields import JSONField
  from philo.utils import ContentTypeSubclassLimiter
  from philo.utils.entities import LazyPassthroughAttributeMapper
@@@ -24,13 -24,13 +24,13 @@@ __all__ = ('Node', 'View', 'MultiView'
  _view_content_type_limiter = ContentTypeSubclassLimiter(None)
  
  
- class Node(TreeEntity):
+ class Node(SlugTreeEntity):
  	"""
  	:class:`Node`\ s are the basic building blocks of a website using Philo. They define the URL hierarchy and connect each URL to a :class:`View` subclass instance which is used to generate an HttpResponse.
  	
  	"""
 -	view_content_type = models.ForeignKey(ContentType, related_name='node_view_set', limit_choices_to=_view_content_type_limiter)
 -	view_object_id = models.PositiveIntegerField()
 +	view_content_type = models.ForeignKey(ContentType, related_name='node_view_set', limit_choices_to=_view_content_type_limiter, blank=True, null=True)
 +	view_object_id = models.PositiveIntegerField(blank=True, null=True)
  	#: :class:`GenericForeignKey` to a non-abstract subclass of :class:`View`
  	view = generic.GenericForeignKey('view_content_type', 'view_object_id')
  	
@@@ -42,15 -42,11 +42,15 @@@
  		return False
  	
  	def handles_subpath(self, subpath):
 -		return self.view.handles_subpath(subpath)
 +		if self.view:
 +			return self.view.handles_subpath(subpath)
 +		return False
  	
  	def render_to_response(self, request, extra_context=None):
  		"""This is a shortcut method for :meth:`View.render_to_response`"""
 -		return self.view.render_to_response(request, extra_context)
 +		if self.view:
 +			return self.view.render_to_response(request, extra_context)
 +		raise Http404
  	
  	def get_absolute_url(self, request=None, with_domain=False, secure=False):
  		"""
@@@ -108,7 -104,7 +108,7 @@@
  		
  		return '%s%s%s%s' % (domain, root_url, path, subpath)
  	
- 	class Meta:
+ 	class Meta(SlugTreeEntity.Meta):
  		app_label = 'philo'
  
  
@@@ -239,7 -235,7 +239,7 @@@ class MultiView(View)
  		
  		"""
  		clear_url_caches()
- 		subpath = request.node.subpath
+ 		subpath = request.node._subpath
  		view, args, kwargs = resolve(subpath, urlconf=self)
  		view_args = getargspec(view)
  		if extra_context is not None and ('extra_context' in view_args[0] or view_args[2] is not None):