X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/29a8fe23f044fef02eefe9c531f4299ef715334a..855ec6e1d29382dcbbfa63aece9e3b127b8ecf11:/models/nodes.py?ds=sidebyside

diff --git a/models/nodes.py b/models/nodes.py
index f84565d..23be42b 100644
--- a/models/nodes.py
+++ b/models/nodes.py
@@ -10,7 +10,7 @@ from inspect import getargspec
 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
+from philo.exceptions import ViewDoesNotProvideSubpaths, AncestorDoesNotExist
 
 
 _view_content_type_limiter = ContentTypeSubclassLimiter(None)
@@ -30,6 +30,13 @@ class Node(TreeEntity):
 	def render_to_response(self, request, path=None, subpath=None, extra_context=None):
 		return self.view.render_to_response(self, request, path, subpath, extra_context)
 	
+	def get_absolute_url(self):
+		root = Site.objects.get_current().root_node
+		try:
+			return '/%s' % self.get_path(root=root)
+		except AncestorDoesNotExist:
+			return None
+	
 	class Meta:
 		app_label = 'philo'
 
@@ -73,12 +80,12 @@ class MultiView(View):
 			subpath = ""
 		subpath = "/" + subpath
 		view, args, kwargs = resolve(subpath, urlconf=self)
-		view_args = getargspec(view)[0]
-		if extra_context is not None and 'extra_context' in view_args:
+		view_args = getargspec(view)
+		if extra_context is not None and ('extra_context' in view_args[0] or view_args[2] is not None):
 			if 'extra_context' in kwargs:
 				extra_context.update(kwargs['extra_context'])
 			kwargs['extra_context'] = extra_context
-		if 'node' in view_args:
+		if 'node' in view_args[0] or view_args[2] is not None:
 			kwargs['node'] = node
 		return view(request, *args, **kwargs)