X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/01a66d144c3ac6539991c5b9f00e1bd5bab132ee..4c2f395f73a970c302682ad76913b6bb38f70568:/models/nodes.py?ds=sidebyside

diff --git a/models/nodes.py b/models/nodes.py
index ae2e081..0ece55f 100644
--- a/models/nodes.py
+++ b/models/nodes.py
@@ -3,15 +3,16 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic
 from django.contrib.sites.models import Site
 from django.http import HttpResponse, HttpResponseServerError, HttpResponseRedirect
+from django.core.exceptions import ViewDoesNotExist
 from django.core.servers.basehttp import FileWrapper
-from django.core.urlresolvers import resolve, clear_url_caches
+from django.core.urlresolvers import resolve, clear_url_caches, reverse, NoReverseMatch
 from django.template import add_to_builtins as register_templatetags
 from inspect import getargspec
 from philo.exceptions import MIDDLEWARE_NOT_CONFIGURED
 from philo.models.base import TreeEntity, Entity, QuerySetMapper, register_value_model
 from philo.utils import ContentTypeSubclassLimiter
 from philo.validators import RedirectValidator
-from philo.exceptions import ViewDoesNotProvideSubpaths, AncestorDoesNotExist
+from philo.exceptions import ViewCanNotProvideSubpath, ViewDoesNotProvideSubpaths, AncestorDoesNotExist
 from philo.signals import view_about_to_render, view_finished_rendering
 
 
@@ -33,10 +34,18 @@ class Node(TreeEntity):
 		return self.view.render_to_response(request, extra_context)
 	
 	def get_absolute_url(self):
-		root = Site.objects.get_current().root_node
 		try:
-			return '/%s' % self.get_path(root=root)
-		except AncestorDoesNotExist:
+			root = Site.objects.get_current().root_node
+		except Site.DoesNotExist:
+			root = None
+		
+		try:
+			path = self.get_path(root=root)
+			if path:
+				path += '/'
+			root_url = reverse('philo-root')
+			return '%s%s' % (root_url, path)
+		except AncestorDoesNotExist, ViewDoesNotExist:
 			return None
 	
 	class Meta:
@@ -53,7 +62,18 @@ class View(Entity):
 	accepts_subpath = False
 	
 	def get_subpath(self, obj):
-		raise ViewDoesNotProvideSubpaths
+		if not self.accepts_subpath:
+			raise ViewDoesNotProvideSubpaths
+		
+		view_name, args, kwargs = self.get_reverse_params(obj)
+		try:
+			return reverse(view_name, args=args, kwargs=kwargs, urlconf=self)
+		except NoReverseMatch:
+			raise ViewCanNotProvideSubpath
+	
+	def get_reverse_params(self, obj):
+		"""This method should return a view_name, args, kwargs tuple suitable for reversing a url for the given obj using self as the urlconf."""
+		raise NotImplementedError("View subclasses must implement get_reverse_params to support subpaths.")
 	
 	def attributes_with_node(self, node):
 		return QuerySetMapper(self.attribute_set, passthrough=node.attributes)
@@ -81,7 +101,9 @@ _view_content_type_limiter.cls = View
 class MultiView(View):
 	accepts_subpath = True
 	
-	urlpatterns = []
+	@property
+	def urlpatterns(self, obj):
+		raise NotImplementedError("MultiView subclasses must implement urlpatterns.")
 	
 	def actually_render_to_response(self, request, extra_context=None):
 		clear_url_caches()