X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/71b0be75c6fae624d8d4c7690b6abca4b19be922..e1a2167421a6b3538a405ec037c72777163fb949:/models.py?ds=inline

diff --git a/models.py b/models.py
index 6eac9de..464b3b5 100644
--- a/models.py
+++ b/models.py
@@ -5,18 +5,15 @@ from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.contrib.sites.models import Site
-from utils import fattr
+from philo.utils import fattr
 from django.template import add_to_builtins as register_templatetags
 from django.template import Template as DjangoTemplate
 from django.template import TemplateDoesNotExist
 from django.template import Context, RequestContext
 from django.core.exceptions import ObjectDoesNotExist
-try:
-	import json
-except ImportError:
-	import simplejson as json
+from django.utils import simplejson as json
 from UserDict import DictMixin
-from templatetags.containers import ContainerNode
+from philo.templatetags.containers import ContainerNode
 from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode
 from django.template.loader import get_template
 from django.http import Http404, HttpResponse, HttpResponseServerError, HttpResponseRedirect
@@ -99,12 +96,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 +123,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 +244,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,7 +295,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
@@ -356,7 +365,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)