X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/c9f444ffc08eff21b504db84701b7afc21330da9..2380185d894e5a62a20b91a0c5a3a48497fb3cfb:/models/nodes.py

diff --git a/models/nodes.py b/models/nodes.py
index 9eb2bd0..f46ddce 100644
--- a/models/nodes.py
+++ b/models/nodes.py
@@ -4,9 +4,13 @@ from django.contrib.contenttypes import generic
 from django.contrib.sites.models import Site
 from django.http import HttpResponse, HttpResponseServerError, HttpResponseRedirect
 from django.core.servers.basehttp import FileWrapper
+from django.core.urlresolvers import resolve
+from django.template import add_to_builtins as register_templatetags
+from inspect import getargspec
 from philo.models.base import TreeEntity, Entity, QuerySetMapper
 from philo.utils import ContentTypeSubclassLimiter
 from philo.validators import RedirectValidator
+from philo.exceptions import ViewDoesNotProvideSubpaths
 
 
 _view_content_type_limiter = ContentTypeSubclassLimiter(None)
@@ -19,7 +23,9 @@ class Node(TreeEntity):
 	
 	@property
 	def accepts_subpath(self):
-		return self.view.accepts_subpath
+		if self.view:
+			return self.view.accepts_subpath
+		return False
 	
 	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)
@@ -37,6 +43,9 @@ class View(Entity):
 	
 	accepts_subpath = False
 	
+	def get_subpath(self, obj):
+		raise ViewDoesNotProvideSubpaths
+	
 	def attributes_with_node(self, node):
 		return QuerySetMapper(self.attribute_set, passthrough=node.attributes)
 	
@@ -48,7 +57,6 @@ class View(Entity):
 	
 	class Meta:
 		abstract = True
-		app_label = 'philo'
 
 
 _view_content_type_limiter.cls = View
@@ -63,13 +71,18 @@ class MultiView(View):
 		if not subpath:
 			subpath = ""
 		subpath = "/" + subpath
-		from django.core.urlresolvers import resolve
 		view, args, kwargs = resolve(subpath, urlconf=self)
+		view_args = getargspec(view)[0]
+		if extra_context is not None and 'extra_context' in view_args:
+			if 'extra_context' in kwargs:
+				extra_context.update(kwargs['extra_context'])
+			kwargs['extra_context'] = extra_context
+		if 'node' in view_args:
+			kwargs['node'] = node
 		return view(request, *args, **kwargs)
 	
 	class Meta:
 		abstract = True
-		app_label = 'philo'
 
 
 class Redirect(View):
@@ -102,4 +115,10 @@ class File(View):
 		return response
 	
 	class Meta:
-		app_label = 'philo'
\ No newline at end of file
+		app_label = 'philo'
+	
+	def __unicode__(self):
+		return self.file.name
+
+
+register_templatetags('philo.templatetags.nodes')
\ No newline at end of file