X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/d2015bc39e4517540efae2f4f5cc1c77683a6f77..36f395364e4467720c550c829d1bfec2e9da5d5f:/models.py?ds=sidebyside diff --git a/models.py b/models.py index 878d3d4..b66c4c3 100644 --- a/models.py +++ b/models.py @@ -5,23 +5,21 @@ 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, ValidationError -try: - import json -except ImportError: - import simplejson as json +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.core.servers.basehttp import FileWrapper from django.conf import settings +from philo.validators import URLRedirectValidator def register_value_model(model): @@ -104,6 +102,13 @@ class Entity(models.Model): 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): @@ -120,6 +125,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 u'%s - %s' % (self.collection, self.member) class TreeManager(models.Manager): @@ -157,6 +165,7 @@ class TreeManager(models.Manager): return (obj, remainder) raise self.model.DoesNotExist('%s matching query does not exist.' % self.model._meta.object_name) + class TreeModel(models.Model): objects = TreeManager() parent = models.ForeignKey('self', related_name='children', null=True, blank=True) @@ -166,7 +175,6 @@ class TreeModel(models.Model): path = getattr(self, field, '?') parent = self.parent while parent: - self.validate_parent(parent) path = getattr(parent, field, '?') + pathsep + path parent = parent.parent return path @@ -177,30 +185,6 @@ class TreeModel(models.Model): class Meta: abstract = True - - def validate_parents(self, parent=None): - if parent == None: - parent = self.parent - - while parent: - try: - self.validate_parent(parent) - parent = parent.parent - except ObjectDoesNotExist: - return # because it likely means the child doesn't exist - - def validate_parent(self, parent): - #Why doesn't this stop the Admin site from saving a model with itself as parent? - if self == parent: - raise ValidationError("A %s can't be its own parent." % self.__class__.__name__) - - def clean(self): - super(TreeModel, self).clean() - self.validate_parents() - - def save(self, *args, **kwargs): - self.clean() - super(TreeModel, self).save(*args, **kwargs) class TreeEntity(TreeModel, Entity): @@ -230,17 +214,16 @@ class InheritableTreeEntity(TreeEntity): @property def instance(self): - return self.instance_type.get_object_for_this_type(id=self.id) - - def validate_parent(self, parent): - if self.instance == parent.instance: - raise ValidationError("A %s can't be its own parent." % self.__class__.__name__) + try: + return self.instance_type.get_object_for_this_type(id=self.id) + except: + return None def get_path(self, pathsep='/', field='slug'): - path = getattr(self.instance, field, '?') + path = getattr(self.instance, field, getattr(self.instance, 'slug', '?')) parent = self.parent while parent: - path = getattr(parent.instance, field, '?') + pathsep + path + path = getattr(parent.instance, field, getattr(parent.instance, 'slug', '?')) + pathsep + path parent = parent.parent return path path = property(get_path) @@ -268,7 +251,7 @@ class Node(InheritableTreeEntity): return HttpResponseServerError() class Meta: - unique_together=(('parent', 'slug',),) + unique_together = (('parent', 'slug'),) class MultiNode(Node): @@ -293,7 +276,7 @@ class Redirect(Node): (302, 'Temporary'), (301, 'Permanent'), ) - target = models.URLField(help_text='Must be a valid, absolute URL (i.e. http://)') + target = models.CharField(max_length=200,validators=[URLRedirectValidator()]) status_code = models.IntegerField(choices=STATUS_CODES, default=302, verbose_name='redirect type') def render_to_response(self, request, path=None, subpath=None): @@ -387,7 +370,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) @@ -408,14 +391,20 @@ class Contentlet(models.Model): name = models.CharField(max_length=255) content = models.TextField() dynamic = models.BooleanField(default=False) + + def __unicode__(self): + return self.name class ContentReference(models.Model): page = models.ForeignKey(Page, related_name='contentreferences') name = models.CharField(max_length=255) content_type = models.ForeignKey(ContentType, verbose_name='Content type') - content_id = models.PositiveIntegerField(verbose_name='Content ID') + content_id = models.PositiveIntegerField(verbose_name='Content ID', blank=True, null=True) content = generic.GenericForeignKey('content_type', 'content_id') + + def __unicode__(self): + return self.name register_templatetags('philo.templatetags.containers')