X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/b988d30ee8173f12ff54d7f0228239bacf4c723e..6a9c8723936694a6b55f8b4bdcac7009c6c3cccf:/models.py

diff --git a/models.py b/models.py
index b1da9d0..d3bf5d4 100644
--- a/models.py
+++ b/models.py
@@ -238,6 +238,9 @@ class Node(InheritableTreeEntity):
 	
 	def render_to_response(self, request, path=None, subpath=None):
 		return HttpResponseServerError()
+		
+	class Meta:
+		unique_together=(('parent', 'slug',),)
 
 
 class MultiNode(Node):
@@ -286,8 +289,7 @@ class File(Node):
 class Template(TreeModel):
 	name = models.CharField(max_length=255)
 	documentation = models.TextField(null=True, blank=True)
-	mimetype = models.CharField(max_length=255, null=True, blank=True,
-	    help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE)
+	mimetype = models.CharField(max_length=255, null=True, blank=True, help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE)
 	code = models.TextField(verbose_name='django template code')
 	
 	@property
@@ -311,7 +313,7 @@ class Template(TreeModel):
 				nodes = []
 				for node in nodelist:
 					try:
-						for nodelist_name in ('nodelist', 'nodelist_loop', 'nodelist_empty', 'nodelist_true', 'nodelist_false'):
+						for nodelist_name in ('nodelist', 'nodelist_loop', 'nodelist_empty', 'nodelist_true', 'nodelist_false', 'nodelist_main'):
 							if hasattr(node, nodelist_name):
 								nodes.extend(nodelist_container_nodes(getattr(node, nodelist_name)))
 						if isinstance(node, ContainerNode):
@@ -357,9 +359,7 @@ class Template(TreeModel):
 
 class Page(Node):
 	"""
-	Represents an HTML page. The page will have a number of related Contentlets
-	depending on the template selected - but these will appear only after the
-	page has been saved with that template.
+	Represents an HTML page. The page will have a number of related Contentlets depending on the template selected - but these will appear only after the page has been saved with that template.
 	"""
 	template = models.ForeignKey(Template, related_name='pages')
 	title = models.CharField(max_length=255)