X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/72fac53a4cd42e6c9f56a581a85f8b47ba61b2ac..c9a2658473cae9e498216a7aa98adba9e3e774ba:/views.py?ds=sidebyside

diff --git a/views.py b/views.py
index 5e4b7dd..911adfe 100644
--- a/views.py
+++ b/views.py
@@ -1,19 +1,22 @@
 from django.http import Http404, HttpResponse
 from django.template import RequestContext
 from django.contrib.sites.models import Site
-from models import Node
+from philo.models import Node
 
 
 def node_view(request, path=None, **kwargs):
 	node = None
+	subpath = None
 	if path is None:
 		path = '/'
 	try:
 		current_site = Site.objects.get_current()
 		if current_site:
-			node = Node.objects.get_with_path(path, root=current_site.root_node)
+			node, subpath = Node.objects.get_with_path(path, root=current_site.root_node, absolute_result=False)
 	except Node.DoesNotExist:
 		raise Http404
 	if not node:
 		raise Http404
-	return node.instance.render_to_response(request, path=path)
+	if subpath and not node.accepts_subpath:
+		raise Http404
+	return node.render_to_response(request, path=path, subpath=subpath)