Merge branch 'penfield' of git://github.com/kgodey/philo into penfield

[philo.git] / models.py

diff --git a/models.py b/models.py
index bf11cb5..39f166c 100644 (file)
--- a/models.py
+++ b/models.py
@@ -5,7 +5,7 @@ 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 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 add_to_builtins as register_templatetags
 from django.template import Template as DjangoTemplate
 from django.template import TemplateDoesNotExist


@@ -13,7 +13,7 @@ from django.template import Context, RequestContext
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils import simplejson as json
 from UserDict import DictMixin
 from django.core.exceptions import ObjectDoesNotExist
 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
 from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode
 from django.template.loader import get_template
 from django.http import Http404, HttpResponse, HttpResponseServerError, HttpResponseRedirect


@@ -101,6 +101,13 @@ class Entity(models.Model):
 class Collection(models.Model):
        name = models.CharField(max_length=255)
        description = models.TextField(blank=True, null=True)
 class Collection(models.Model):
        name = models.CharField(max_length=255)
        description = models.TextField(blank=True, null=True)

+       
+       @fattr(short_description='Members')
+       def get_count(self):
+               return self.members.count()
+       
+       def __unicode__(self):
+               return self.name

 
 
 class CollectionMemberManager(models.Manager):
 
 
 class CollectionMemberManager(models.Manager):


@@ -117,6 +124,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')
        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 u'%s - %s' % (self.collection, self.member)

 
 
 class TreeManager(models.Manager):
 
 
 class TreeManager(models.Manager):


@@ -235,6 +245,9 @@ class Node(InheritableTreeEntity):
        
        def render_to_response(self, request, path=None, subpath=None):
                return HttpResponseServerError()
        
        def render_to_response(self, request, path=None, subpath=None):
                return HttpResponseServerError()

+               
+       class Meta:
+               unique_together = (('parent', 'slug'),)

 
 
 class MultiNode(Node):
 
 
 class MultiNode(Node):


@@ -278,6 +291,9 @@ class File(Node):
                response = HttpResponse(wrapper, content_type=self.mimetype)
                response['Content-Length'] = self.file.size
                return response
                response = HttpResponse(wrapper, content_type=self.mimetype)
                response['Content-Length'] = self.file.size
                return response

+       
+       def __unicode__(self):
+               return self.file

 
 
 class Template(TreeModel):
 
 
 class Template(TreeModel):


@@ -353,9 +369,7 @@ class Template(TreeModel):
 
 class Page(Node):
        """
 
 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)
        """
        template = models.ForeignKey(Template, related_name='pages')
        title = models.CharField(max_length=255)


@@ -376,6 +390,9 @@ class Contentlet(models.Model):
        name = models.CharField(max_length=255)
        content = models.TextField()
        dynamic = models.BooleanField(default=False)
        name = models.CharField(max_length=255)
        content = models.TextField()
        dynamic = models.BooleanField(default=False)

+       
+       def __unicode__(self):
+               return self.name

 
 
 class ContentReference(models.Model):
 
 
 class ContentReference(models.Model):


@@ -384,6 +401,9 @@ class ContentReference(models.Model):
        content_type = models.ForeignKey(ContentType, verbose_name='Content type')
        content_id = models.PositiveIntegerField(verbose_name='Content ID')
        content = generic.GenericForeignKey('content_type', 'content_id')
        content_type = models.ForeignKey(ContentType, verbose_name='Content type')
        content_id = models.PositiveIntegerField(verbose_name='Content ID')
        content = generic.GenericForeignKey('content_type', 'content_id')

+       
+       def __unicode__(self):
+               return self.name

 
 
 register_templatetags('philo.templatetags.containers')
 
 
 register_templatetags('philo.templatetags.containers')