X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/98bd3a178f3e62e5591e809ac61e07a5bf37c292..3b366a97268ee50421047f5e147aef8a8c4fc984:/models/nodes.py

diff --git a/models/nodes.py b/models/nodes.py
index 2bda588..ae2e081 100644
--- a/models/nodes.py
+++ b/models/nodes.py
@@ -7,6 +7,7 @@ from django.core.servers.basehttp import FileWrapper
 from django.core.urlresolvers import resolve, clear_url_caches
 from django.template import add_to_builtins as register_templatetags
 from inspect import getargspec
+from philo.exceptions import MIDDLEWARE_NOT_CONFIGURED
 from philo.models.base import TreeEntity, Entity, QuerySetMapper, register_value_model
 from philo.utils import ContentTypeSubclassLimiter
 from philo.validators import RedirectValidator
@@ -28,8 +29,8 @@ class Node(TreeEntity):
 			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)
+	def render_to_response(self, request, extra_context=None):
+		return self.view.render_to_response(request, extra_context)
 	
 	def get_absolute_url(self):
 		root = Site.objects.get_current().root_node
@@ -57,14 +58,17 @@ class View(Entity):
 	def attributes_with_node(self, node):
 		return QuerySetMapper(self.attribute_set, passthrough=node.attributes)
 	
-	def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+	def render_to_response(self, request, extra_context=None):
+		if not hasattr(request, 'node'):
+			raise MIDDLEWARE_NOT_CONFIGURED
+		
 		extra_context = extra_context or {}
-		view_about_to_render.send(sender=self, node=node, request=request, path=path, subpath=subpath, extra_context=extra_context)
-		response = self.actually_render_to_response(node, request, path, subpath, extra_context)
+		view_about_to_render.send(sender=self, request=request, extra_context=extra_context)
+		response = self.actually_render_to_response(request, extra_context)
 		view_finished_rendering.send(sender=self, response=response)
 		return response
 	
-	def actually_render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+	def actually_render_to_response(self, request, extra_context=None):
 		raise NotImplementedError('View subclasses must implement render_to_response.')
 	
 	class Meta:
@@ -79,8 +83,9 @@ class MultiView(View):
 	
 	urlpatterns = []
 	
-	def actually_render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+	def actually_render_to_response(self, request, extra_context=None):
 		clear_url_caches()
+		subpath = request.node.subpath
 		if not subpath:
 			subpath = ""
 		subpath = "/" + subpath
@@ -90,8 +95,6 @@ class MultiView(View):
 			if 'extra_context' in kwargs:
 				extra_context.update(kwargs['extra_context'])
 			kwargs['extra_context'] = extra_context
-		if 'node' in view_args[0] or view_args[2] is not None:
-			kwargs['node'] = node
 		return view(request, *args, **kwargs)
 	
 	class Meta:
@@ -106,7 +109,7 @@ class Redirect(View):
 	target = models.CharField(max_length=200, validators=[RedirectValidator()])
 	status_code = models.IntegerField(choices=STATUS_CODES, default=302, verbose_name='redirect type')
 	
-	def actually_render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+	def actually_render_to_response(self, request, extra_context=None):
 		response = HttpResponseRedirect(self.target)
 		response.status_code = self.status_code
 		return response
@@ -115,13 +118,14 @@ class Redirect(View):
 		app_label = 'philo'
 
 
+# Why does this exist?
 class File(View):
 	""" For storing arbitrary files """
 	
 	mimetype = models.CharField(max_length=255)
 	file = models.FileField(upload_to='philo/files/%Y/%m/%d')
 	
-	def actually_render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+	def actually_render_to_response(self, request, extra_context=None):
 		wrapper = FileWrapper(self.file)
 		response = HttpResponse(wrapper, content_type=self.mimetype)
 		response['Content-Length'] = self.file.size