X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/5adae760fc382cd1f3fdc7ee02f2b8cc0dc5cfa6..e96369a63407b44b8e363b057194a89dc4c5fd69:/philo/models/nodes.py

diff --git a/philo/models/nodes.py b/philo/models/nodes.py
index 0c89095..5b8b8ed 100644
--- a/philo/models/nodes.py
+++ b/philo/models/nodes.py
@@ -1,5 +1,6 @@
 from inspect import getargspec
 import mimetypes
+from os.path import basename
 
 from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
@@ -30,8 +31,8 @@ class Node(SlugTreeEntity):
 	:class:`Node`\ s are the basic building blocks of a website using Philo. They define the URL hierarchy and connect each URL to a :class:`View` subclass instance which is used to generate an HttpResponse.
 	
 	"""
-	view_content_type = models.ForeignKey(ContentType, related_name='node_view_set', limit_choices_to=_view_content_type_limiter)
-	view_object_id = models.PositiveIntegerField()
+	view_content_type = models.ForeignKey(ContentType, related_name='node_view_set', limit_choices_to=_view_content_type_limiter, blank=True, null=True)
+	view_object_id = models.PositiveIntegerField(blank=True, null=True)
 	#: :class:`GenericForeignKey` to a non-abstract subclass of :class:`View`
 	view = generic.GenericForeignKey('view_content_type', 'view_object_id')
 	
@@ -43,11 +44,15 @@ class Node(SlugTreeEntity):
 		return False
 	
 	def handles_subpath(self, subpath):
-		return self.view.handles_subpath(subpath)
+		if self.view:
+			return self.view.handles_subpath(subpath)
+		return False
 	
 	def render_to_response(self, request, extra_context=None):
 		"""This is a shortcut method for :meth:`View.render_to_response`"""
-		return self.view.render_to_response(request, extra_context)
+		if self.view:
+			return self.view.render_to_response(request, extra_context)
+		raise Http404
 	
 	def get_absolute_url(self, request=None, with_domain=False, secure=False):
 		"""
@@ -388,6 +393,7 @@ class File(View):
 		wrapper = FileWrapper(self.file)
 		response = HttpResponse(wrapper, content_type=self.mimetype)
 		response['Content-Length'] = self.file.size
+		response['Content-Disposition'] = "inline; filename=%s" % basename(self.file.name)
 		return response
 	
 	class Meta: