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

diff --git a/models.py b/models.py
index cea36c2..c62d7eb 100644
--- a/models.py
+++ b/models.py
@@ -21,6 +21,7 @@ from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, Includ
 from django.template.loader import get_template
 from django.http import Http404, HttpResponse, HttpResponseServerError, HttpResponseRedirect
 from django.core.servers.basehttp import FileWrapper
+from django.conf import settings
 
 
 def register_value_model(model):
@@ -98,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
@@ -119,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):
@@ -237,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):
@@ -261,7 +274,7 @@ class Redirect(Node):
 		(302, 'Temporary'),
 		(301, 'Permanent'),
 	)
-	target = models.URLField()
+	target = models.URLField(help_text='Must be a valid, absolute URL (i.e. http://)')
 	status_code = models.IntegerField(choices=STATUS_CODES, default=302, verbose_name='redirect type')
 	
 	def render_to_response(self, request, path=None, subpath=None):
@@ -285,8 +298,8 @@ 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)
-	code = models.TextField()
+	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
 	def origin(self):
@@ -309,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):
@@ -354,6 +367,9 @@ class Template(TreeModel):
 
 
 class Page(Node):
+	"""
+	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)