X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/3b81e33488137c52ea840c56f36d4ab7ecbbad1b..7515976d9cc927f6f72a191442c5788856f610fd:/models.py?ds=sidebyside diff --git a/models.py b/models.py index c62d7eb..c17cd70 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 -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 from django.core.servers.basehttp import FileWrapper from django.conf import settings +from philo.validators import RedirectValidator def register_value_model(model): @@ -99,19 +97,20 @@ 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) + @fattr(short_description='Members') 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 @@ -128,7 +127,7 @@ class CollectionMember(models.Model): member = generic.GenericForeignKey('member_content_type', 'member_object_id') def __unicode__(self): - return '%s - %s' % (self.collection, self.member) + return u'%s - %s' % (self.collection, self.member) class TreeManager(models.Manager): @@ -215,13 +214,16 @@ class InheritableTreeEntity(TreeEntity): @property def instance(self): - return self.instance_type.get_object_for_this_type(id=self.id) + 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) @@ -249,7 +251,7 @@ class Node(InheritableTreeEntity): return HttpResponseServerError() class Meta: - unique_together=(('parent', 'slug',),) + unique_together = (('parent', 'slug'),) class MultiNode(Node): @@ -274,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=[RedirectValidator()]) status_code = models.IntegerField(choices=STATUS_CODES, default=302, verbose_name='redirect type') def render_to_response(self, request, path=None, subpath=None): @@ -298,7 +300,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, default=settings.DEFAULT_CONTENT_TYPE) + mimetype = models.CharField(max_length=255, null=True, blank=True, help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE) code = models.TextField(verbose_name='django template code') @property @@ -389,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')