From 11f73a007be0528b1802df7bf5425ff750219bf0 Mon Sep 17 00:00:00 2001 From: leidel Date: Tue, 13 May 2008 23:42:57 +0000 Subject: [PATCH] stuuupid bug git-svn-id: https://django-dbtemplates.googlecode.com/svn/trunk@30 cfb8ba98-e953-0410-9cff-959ffddf5974 committer: leidel --HG-- extra : convert_revision : eced669baec4919151e2c7c8f7834a7318fbc4a0 --- dbtemplates/models.py | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/dbtemplates/models.py b/dbtemplates/models.py index db35686..d7b2fc0 100644 --- a/dbtemplates/models.py +++ b/dbtemplates/models.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +from datetime import datetime from django.db import models from django.template import loader, Context from django.core import validators @@ -13,29 +14,50 @@ class Template(models.Model): name = models.CharField(_('name'), unique=True, max_length=100, help_text=_("Example: 'flatpages/default.html'")) content = models.TextField(_('content')) sites = models.ManyToManyField(Site) - creation_date = models.DateTimeField(_('creation date'), auto_now_add=True) - last_changed = models.DateTimeField(_('last changed'), auto_now=True) + creation_date = models.DateTimeField(_('creation date'), default=datetime.now) + last_changed = models.DateTimeField(_('last changed'), default=datetime.now) + class Meta: db_table = 'django_template' verbose_name = _('template') verbose_name_plural = _('templates') ordering = ('name',) + class Admin: - fields = ((None, {'fields': ('name', 'content', 'sites')}),) + fields = ( + (None, { + 'fields': ( + 'name', + 'content', + 'sites' + ) + } + ), + (_('Date information'), { + 'fields': ( + 'creation_date', + 'last_changed' + ), + 'classes': 'collapse' + } + ), + ) list_display = ('name', 'creation_date', 'last_changed') - list_filter = ('sites',) - search_fields = ('name','content') + search_fields = ('name', 'content') def __unicode__(self): return self.name + + def save(self): + self.last_changed = datetime.now() + super(Template, self).save() try: from django.contrib.admin import ModelAdmin, site class TemplateOptions(ModelAdmin): field_sets = ((None, {'fields': ('name', 'content', 'sites')}),) list_display = ('name', 'creation_date', 'last_changed') - list_filter = ('sites',) - search_fields = ('name','content') + search_fields = ('name', 'content') site.register(Template, TemplateOptions) except ImportError: pass