From: melinath Date: Mon, 14 Jun 2010 19:42:28 +0000 (-0400) Subject: Rebased to origin; removed treechanges. X-Git-Tag: philo-0.9~78^2~2^2~6 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/e1a2167421a6b3538a405ec037c72777163fb949?hp=d4e6b90b55aff9b98a67615c64fce5089a82f947 Rebased to origin; removed treechanges. --- diff --git a/admin.py b/admin.py index 1ed5586..0744e0b 100644 --- a/admin.py +++ b/admin.py @@ -8,6 +8,8 @@ from django.utils.safestring import mark_safe from django.utils.html import escape from django.utils.text import truncate_words from philo.models import * +from django.core.exceptions import ValidationError, ObjectDoesNotExist +from validators import TreeParentValidator, TreePositionValidator class AttributeInline(generic.GenericTabularInline): @@ -43,6 +45,42 @@ class CollectionMemberInline(admin.TabularInline): class CollectionAdmin(admin.ModelAdmin): inlines = [CollectionMemberInline] + list_display = ('name', 'description', 'get_count') + + +class TreeForm(forms.ModelForm): + def __init__(self, *args, **kwargs): + super(TreeForm, self).__init__(*args, **kwargs) + instance = self.instance + instance_class=self.get_instance_class() + + if instance_class is not None: + try: + self.fields['parent'].queryset = instance_class.objects.exclude(id=instance.id) + except ObjectDoesNotExist: + pass + + self.fields['parent'].validators = [TreeParentValidator(*self.get_validator_args())] + + def get_instance_class(self): + return self.instance.__class__ + + def get_validator_args(self): + return [self.instance] + + def clean(self): + cleaned_data = self.cleaned_data + + try: + parent = cleaned_data['parent'] + slug = cleaned_data['slug'] + obj_class = self.get_instance_class() + tpv = TreePositionValidator(parent, slug, obj_class) + tpv(self.instance) + except KeyError: + pass + + return cleaned_data class TemplateAdmin(admin.ModelAdmin): @@ -65,6 +103,8 @@ class TemplateAdmin(admin.ModelAdmin): ) save_on_top = True save_as = True + list_display = ('__unicode__', 'slug', 'get_path',) + form = TreeForm class ModelLookupWidget(forms.TextInput): @@ -94,6 +134,29 @@ class ModelLookupWidget(forms.TextInput): return mark_safe(output) +class NodeForm(TreeForm): + def get_instance_class(self): + return Node + + def get_validator_args(self): + return [self.instance, 'instance'] + + +class PageAdminForm(NodeForm): + class Meta: + model=Page + + +class RedirectAdminForm(NodeForm): + class Meta: + model=Redirect + + +class FileAdminForm(NodeForm): + class Meta: + model=File + + class PageAdmin(EntityAdmin): prepopulated_fields = {'slug': ('title',)} fieldsets = ( @@ -108,6 +171,7 @@ class PageAdmin(EntityAdmin): list_display = ('title', 'path', 'template') list_filter = ('template',) search_fields = ['title', 'slug', 'contentlets__content'] + form = PageAdminForm def get_fieldsets(self, request, obj=None, **kwargs): fieldsets = list(self.fieldsets) @@ -173,8 +237,19 @@ class PageAdmin(EntityAdmin): contentreference.save() +class RedirectAdmin(admin.ModelAdmin): + list_display=('slug', 'target', 'path', 'status_code',) + list_filter=('status_code',) + form = RedirectAdminForm + + +class FileAdmin(admin.ModelAdmin): + form=FileAdminForm + list_display=('slug', 'mimetype', 'path', 'file',) + + admin.site.register(Collection, CollectionAdmin) -admin.site.register(Redirect) -admin.site.register(File) +admin.site.register(Redirect, RedirectAdmin) +admin.site.register(File, FileAdmin) admin.site.register(Page, PageAdmin) admin.site.register(Template, TemplateAdmin) diff --git a/models.py b/models.py index ecd1c1f..464b3b5 100644 --- a/models.py +++ b/models.py @@ -96,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 @@ -117,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): @@ -235,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): @@ -283,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 @@ -353,9 +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) diff --git a/templatetags/collections.py b/templatetags/collections.py new file mode 100644 index 0000000..ed8c54e --- /dev/null +++ b/templatetags/collections.py @@ -0,0 +1,43 @@ +from django import template +from django.conf import settings + + +register = template.Library() + + +class MembersofNode(template.Node): + def __init__(self, collection, model, as_var): + self.collection = template.Variable(collection) + self.model = template.Variable(model) + self.as_var = as_var + + def render(self, context): + try: + collection = self.collection.resolve(context) + model = self.model.resolve(context) + context[self.as_var] = collection.members.with_model(model) + except: + pass + return settings.TEMPLATE_STRING_IF_INVALID + + +def do_membersof(parser, token): + """ + {% membersof with as %} + """ + params=token.split_contents() + tag = params[0] + + if len(params) < 6: + raise template.TemplateSyntaxError('"%s" template tag requires six parameters' % tag) + + if params[2] != 'with': + raise template.TemplateSyntaxError('"%s" template tag requires the third parameter to be "with"' % tag) + + if params[4] != 'as': + raise template.TemplateSyntaxError('"%s" template tag requires the fifth parameter to be "as"' % tag) + + return MembersofNode(collection=params[1], model=params[3], as_var=params[5]) + + +register.tag('membersof', do_membersof) \ No newline at end of file diff --git a/templatetags/containers.py b/templatetags/containers.py index ca5e1e9..2e40e53 100644 --- a/templatetags/containers.py +++ b/templatetags/containers.py @@ -29,7 +29,7 @@ class ContainerNode(template.Node): def render(self, context): content = settings.TEMPLATE_STRING_IF_INVALID if 'page' in context: - container_content = self.get_container_content(context['page']) + container_content = self.get_container_content(context) if self.nodelist_main is None: self.nodelist_main @@ -56,7 +56,8 @@ class ContainerNode(template.Node): return '' - def get_container_content(self, page): + def get_container_content(self, context): + page = context['page'] if self.references: try: contentreference = page.contentreferences.get(name__exact=self.name, content_type=self.references) @@ -71,7 +72,7 @@ class ContainerNode(template.Node): content = mark_safe(template.Template(contentlet.content, name=contentlet.name).render(context)) except template.TemplateSyntaxError, error: if settings.DEBUG: - content = ('[Error parsing contentlet \'%s\': %s]' % self.name, error) + content = ('[Error parsing contentlet \'%s\': %s]' % (self.name, error)) else: content = contentlet.content except ObjectDoesNotExist: diff --git a/validators.py b/validators.py new file mode 100644 index 0000000..bc41d02 --- /dev/null +++ b/validators.py @@ -0,0 +1,77 @@ +from django.core.exceptions import ValidationError +from django.utils.translation import ugettext_lazy as _ + + +class TreeParentValidator(object): + """ + constructor takes instance and parent_attr, where instance is the model + being validated and parent_attr is where to look on that parent for the + comparison. + """ + #message = _("A tree element can't be its own parent.") + code = 'invalid' + + def __init__(self, instance, parent_attr=None, message=None, code=None): + self.instance = instance + self.parent_attr = parent_attr + self.static_message = message + if code is not None: + self.code = code + + def __call__(self, value): + """ + Validates that the self.instance is not found in the parent tree of + the node given as value. + """ + parent = value + + while parent: + comparison=self.get_comparison(parent) + if comparison == self.instance: + # using (self.message, code=self.code) results in the admin interface + # screwing with the error message and making it be 'Enter a valid value' + raise ValidationError(self.message) + parent=parent.parent + + def get_comparison(self, parent): + if self.parent_attr and hasattr(parent, self.parent_attr): + return getattr(parent, self.parent_attr) + + return parent + + def get_message(self): + return self.static_message or _(u"A %s can't be its own parent." % self.instance.__class__.__name__) + message = property(get_message) + +class TreePositionValidator(object): + code = 'invalid' + + def __init__(self, parent, slug, obj_class, message=None, code=None): + self.parent = parent + self.slug = slug + self.obj_class = obj_class + self.static_message = message + + if code is not None: + self.code = code + + def __call__(self, value): + """ + Validates that there is no obj of obj_class with the same position + as the compared obj (value) but a different id. + """ + if not isinstance(value, self.obj_class): + raise ValidationError(_(u"The value must be an instance of %s." % self.obj_class.__name__)) + + try: + obj = self.obj_class.objects.get(slug=self.slug, parent=self.parent) + + if obj.id != value.id: + raise ValidationError(self.message) + + except self.obj_class.DoesNotExist: + pass + + def get_message(self): + return self.static_message or _(u"A %s with that path (parent and slug) already exists." % self.obj_class.__name__) + message = property(get_message)