X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/3ce16dd425565e6fc31c49c98bf8d88e09183748..9c6f7a4f5ddd6758197a552bbc689868cf99054c:/middleware.py diff --git a/middleware.py b/middleware.py index fa30ef6..c0b1e9e 100644 --- a/middleware.py +++ b/middleware.py @@ -15,8 +15,13 @@ class LazyNode(object): except Site.DoesNotExist: current_site = None + path = request._cached_node_path + trailing_slash = False + if path[-1] == '/': + trailing_slash = True + try: - node, subpath = Node.objects.get_with_path(request._cached_node_path, root=getattr(current_site, 'root_node', None), absolute_result=False) + node, subpath = Node.objects.get_with_path(path, root=getattr(current_site, 'root_node', None), absolute_result=False) except Node.DoesNotExist: node = None @@ -24,6 +29,10 @@ class LazyNode(object): if subpath is None: subpath = "" subpath = "/" + subpath + + if trailing_slash and subpath[-1] != "/": + subpath += "/" + node.subpath = subpath request._found_node = node