X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/ba412401bcd900ab40a1ec0c2a390ddac330d533..7ea527579abe3945bc5c17063fb94387a3cc981f:/models.py?ds=sidebyside

diff --git a/models.py b/models.py
index b1da9d0..c62d7eb 100644
--- a/models.py
+++ b/models.py
@@ -99,12 +99,18 @@ class Entity(models.Model):
 	
 	class Meta:
 		abstract = True
-
+	
 
 class Collection(models.Model):
 	name = models.CharField(max_length=255)
 	description = models.TextField(blank=True, null=True)
-
+	
+	def get_count(self):
+		return self.members.count()
+	get_count.short_description = 'Members'
+	
+	def __unicode__(self):
+		return self.name
 
 class CollectionMemberManager(models.Manager):
 	use_for_related_fields = True
@@ -120,6 +126,9 @@ class CollectionMember(models.Model):
 	member_content_type = models.ForeignKey(ContentType, verbose_name='Member type')
 	member_object_id = models.PositiveIntegerField(verbose_name='Member ID')
 	member = generic.GenericForeignKey('member_content_type', 'member_object_id')
+	
+	def __unicode__(self):
+		return '%s - %s' % (self.collection, self.member)
 
 
 class TreeManager(models.Manager):
@@ -238,6 +247,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 +298,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, default=settings.DEFAULT_CONTENT_TYPE)
 	code = models.TextField(verbose_name='django template code')
 	
 	@property
@@ -311,7 +322,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 +368,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 a page - something which is rendered according to a template. 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)