From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Wed, 23 Mar 2011 20:00:11 +0000 (-0400)
Subject: Removed shipherd navigation_host filter exception reraising. Tweaked LazyNode - turns... 
X-Git-Tag: philo-0.9~16^2~10
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/fcede7515bdcc3e0e9e191c84817d405e7fe1ed5

Removed shipherd navigation_host filter exception reraising. Tweaked LazyNode - turns out the / needs to be prepended *before* trying to check if the node handles_subpath.
---

diff --git a/contrib/shipherd/templatetags/shipherd.py b/contrib/shipherd/templatetags/shipherd.py
index 57fb020..1413bdf 100644
--- a/contrib/shipherd/templatetags/shipherd.py
+++ b/contrib/shipherd/templatetags/shipherd.py
@@ -167,6 +167,4 @@ def navigation_host(node, key):
 	try:
 		return Navigation.objects.filter(node__in=node.get_ancestors(include_self=True), key=key).order_by('-node__level')[0].node
 	except:
-		if settings.TEMPLATE_DEBUG:
-			raise
 		return node
\ No newline at end of file
diff --git a/middleware.py b/middleware.py
index 5bcd569..5ec3e77 100644
--- a/middleware.py
+++ b/middleware.py
@@ -25,18 +25,17 @@ class LazyNode(object):
 			except Node.DoesNotExist:
 				node = None
 			else:
-				if subpath and not node.handles_subpath(subpath):
-					node = None
-			
-			if node:
 				if subpath is None:
 					subpath = ""
 				subpath = "/" + subpath
 				
-				if trailing_slash and subpath[-1] != "/":
-					subpath += "/"
-				
-				node.subpath = subpath
+				if not node.handles_subpath(subpath):
+					node = None
+				else:
+					if trailing_slash and subpath[-1] != "/":
+						subpath += "/"
+					
+					node.subpath = subpath
 			
 			request._found_node = node