From: Guillaume Pellerin Date: Fri, 20 Jan 2017 14:36:10 +0000 (+0100) Subject: Fix date errors using native date fields X-Git-Tag: 1.7.0~2^2~32 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fe7bbdaf8bd37ec133b62b5acf9c3fa2a5c78a7c;p=telemeta.git Fix date errors using native date fields --- diff --git a/app/settings.py b/app/settings.py index 82dfb3aa..5115889b 100644 --- a/app/settings.py +++ b/app/settings.py @@ -156,7 +156,6 @@ INSTALLED_APPS = ( 'timeside.player', 'timeside.server', 'jsonrpc', - #'south', 'sorl.thumbnail', 'timezones', 'jqchat', diff --git a/telemeta/models/corpus.py b/telemeta/models/corpus.py index 4fc922e1..ffd0ea20 100644 --- a/telemeta/models/corpus.py +++ b/telemeta/models/corpus.py @@ -35,7 +35,7 @@ class MediaCorpus(MediaBaseResource): children_type = 'collections' children = models.ManyToManyField(MediaCollection, related_name="corpus", - verbose_name=_('collections'), blank=True, null=True) + verbose_name=_('collections'), blank=True) recorded_from_year = IntegerField(_('recording year (from)'), help_text=_('YYYY')) recorded_to_year = IntegerField(_('recording year (until)'), help_text=_('YYYY')) @@ -77,5 +77,3 @@ class MediaCorpusRelated(MediaRelated): db_table = 'media_corpus_related' verbose_name = _('corpus related media') verbose_name_plural = _('corpus related media') - - diff --git a/telemeta/models/fields.py b/telemeta/models/fields.py index 8629d043..3616ca88 100644 --- a/telemeta/models/fields.py +++ b/telemeta/models/fields.py @@ -228,6 +228,12 @@ class CharField(models.CharField): kwargs['max_length'] = 250 super(CharField, self).__init__(*args, **normalize_field(kwargs, '')) + def deconstruct(self): + name, path, args, kwargs = super(CharField, self).deconstruct() + print kwargs + del kwargs["max_length"] + return name, path, args, kwargs + class IntegerField(models.IntegerField): """IntegerField normalized with normalize_field()""" diff --git a/telemeta/models/fonds.py b/telemeta/models/fonds.py index db4fa9bb..e5b8dc13 100644 --- a/telemeta/models/fonds.py +++ b/telemeta/models/fonds.py @@ -35,7 +35,7 @@ class MediaFonds(MediaBaseResource): children_type = 'corpus' children = models.ManyToManyField(MediaCorpus, related_name="fonds", - verbose_name=_('corpus'), blank=True, null=True) + verbose_name=_('corpus'), blank=True) objects = MediaFondsManager() @@ -73,5 +73,3 @@ class MediaFondsRelated(MediaRelated): db_table = 'media_fonds_related' verbose_name = _('fonds related media') verbose_name_plural = _('fonds related media') - - diff --git a/telemeta/models/identifier.py b/telemeta/models/identifier.py index 2893657b..ca8ac927 100644 --- a/telemeta/models/identifier.py +++ b/telemeta/models/identifier.py @@ -22,21 +22,22 @@ # Guillaume Pellerin +from django.db import models +from django.utils.translation import ugettext_lazy as _ from telemeta.models.core import * from telemeta.models.fields import * -from django.utils.translation import ugettext_lazy as _ class Identifier(ModelCore): """Resource identifier""" - identifier = CharField(_('identifier'), max_length=255, blank=True, unique=True) + identifier = models.CharField(_('identifier'), max_length=255, blank=True, unique=True) type = WeakForeignKey('IdentifierType', verbose_name=_('type')) - date_add = DateTimeField(_('date added'), auto_now_add=True) - date_first = DateTimeField(_('date of first attribution')) - date_last = DateTimeField(_('date of last attribution')) - date_modified = DateTimeField(_('date modified'), auto_now=True) - notes = TextField(_('notes')) + date_add = models.DateTimeField(_('date added'), auto_now_add=True) + date_first = models.DateTimeField(_('date of first attribution')) + date_last = models.DateTimeField(_('date of last attribution')) + date_modified = models.DateTimeField(_('date modified'), auto_now=True) + notes = models.TextField(_('notes'), null=True) class Meta(MetaCore): abstract = True diff --git a/telemeta/models/item.py b/telemeta/models/item.py index 132e2b01..b68098fc 100644 --- a/telemeta/models/item.py +++ b/telemeta/models/item.py @@ -22,6 +22,7 @@ # Guillaume Pellerin from __future__ import division +from django.db import models from django.utils.translation import ugettext_lazy as _ from telemeta.models.core import * from telemeta.models.resource import * @@ -30,6 +31,7 @@ from telemeta.models.identifier import * from telemeta.models.resource import * from telemeta.models.enum import * + item_published_code_regex = getattr(settings, 'ITEM_PUBLISHED_CODE_REGEX', '[A-Za-z0-9._-]*') item_unpublished_code_regex = getattr(settings, 'ITEM_UNPUBLISHED_CODE_REGEX', '[A-Za-z0-9._-]*') @@ -410,7 +412,7 @@ class MediaItemMarker(MediaResource): public_id = CharField(_('public_id'), required=True) time = FloatField(_('time (s)')) title = CharField(_('title')) - date = DateTimeField(_('date'), auto_now=True) + date = models.DateTimeField(_('date'), auto_now=True) description = TextField(_('description')) author = ForeignKey(User, related_name="markers", verbose_name=_('author'), blank=True, null=True) @@ -433,7 +435,7 @@ class MediaItemTranscoded(MediaResource): item = models.ForeignKey('MediaItem', related_name="transcoded", verbose_name=_('item')) mimetype = models.CharField(_('mime_type'), max_length=255, blank=True) - date_added = DateTimeField(_('date'), auto_now_add=True) + date_added = models.DateTimeField(_('date'), auto_now_add=True) status = models.IntegerField(_('status'), choices=ITEM_TRANSODING_STATUS, default=1) file = models.FileField(_('file'), upload_to='items/%Y/%m/%d', max_length=1024, blank=True) @@ -467,7 +469,7 @@ class MediaItemTranscodingFlag(ModelCore): item = ForeignKey('MediaItem', related_name="transcoding", verbose_name=_('item')) mime_type = CharField(_('mime_type'), required=True) - date = DateTimeField(_('date'), auto_now=True) + date = models.DateTimeField(_('date'), auto_now=True) value = BooleanField(_('transcoded')) class Meta(MetaCore): diff --git a/telemeta/models/resource.py b/telemeta/models/resource.py index 07454b8a..54c1031e 100644 --- a/telemeta/models/resource.py +++ b/telemeta/models/resource.py @@ -22,6 +22,7 @@ # Guillaume Pellerin +from django.db import models from django.utils.translation import ugettext_lazy as _ from telemeta.models.core import * from telemeta.models.system import * @@ -86,7 +87,7 @@ class MediaRelated(MediaResource): element_type = 'media' title = CharField(_('title')) - date = DateTimeField(_('date'), auto_now=True) + date = models.DateTimeField(_('date'), auto_now=True) description = TextField(_('description')) mime_type = CharField(_('mime_type')) url = CharField(_('url'), max_length=500) diff --git a/telemeta/models/system.py b/telemeta/models/system.py index a6fd4481..08697221 100644 --- a/telemeta/models/system.py +++ b/telemeta/models/system.py @@ -21,12 +21,13 @@ # David LIPSZYC # Guillaume Pellerin + +from django.db import models from django.contrib.auth.models import User -from telemeta.models.core import * from django.core.exceptions import ObjectDoesNotExist from django.utils.translation import ugettext_lazy as _ -import django.db.models as models from django.forms import ModelForm +from telemeta.models.core import * class Revision(ModelCore): @@ -38,7 +39,7 @@ class Revision(ModelCore): element_type = CharField(_('element type'), choices=ELEMENT_TYPE_CHOICES, max_length=16, required=True) element_id = IntegerField(_('element identifier'), required=True) change_type = CharField(_('modification type'), choices=CHANGE_TYPE_CHOICES, max_length=16, required=True) - time = DateTimeField(_('time'), auto_now_add=True) + time = models.DateTimeField(_('time'), auto_now_add=True) user = ForeignKey(User, db_column='username', related_name="revisions", verbose_name=_('user')) @classmethod @@ -99,9 +100,9 @@ class Search(ModelCore): element_type = 'search' username = ForeignKey(User, related_name="searches", db_column="username") - date = DateTimeField(_('date'), auto_now_add=True) + date = models.DateTimeField(_('date'), auto_now_add=True) description = CharField(_('Description')) - criteria = models.ManyToManyField(Criteria, related_name="search", verbose_name=_('criteria'), blank=True, null=True) + criteria = models.ManyToManyField(Criteria, related_name="search", verbose_name=_('criteria'), blank=True) class Meta(MetaCore): db_table = 'searches' diff --git a/telemeta/views/boolean_search.py b/telemeta/views/boolean_search.py index 9ed26b22..588a9e77 100644 --- a/telemeta/views/boolean_search.py +++ b/telemeta/views/boolean_search.py @@ -4,6 +4,7 @@ from django.http import HttpResponse from telemeta.forms.boolean_form import * from django.forms.formsets import formset_factory + class BooleanSearchView(object): form = formset_factory(BooleanSearch) @@ -67,4 +68,4 @@ def get_close_bracket(tab): par -= 1 if par !=0: index+= 1 - return index if par == 0 else -1 \ No newline at end of file + return index if par == 0 else -1 diff --git a/telemeta/views/collection.py b/telemeta/views/collection.py index daff446d..703b4ee3 100644 --- a/telemeta/views/collection.py +++ b/telemeta/views/collection.py @@ -24,6 +24,7 @@ from telemeta.views.core import * from telemeta.views.epub import * + class CollectionView(object): """Provide Collections web UI methods""" @@ -383,4 +384,3 @@ class CollectionEpubView(BaseEpubMixin, View): # @method_decorator(permission_required('telemeta.can_download_collection_epub')) def dispatch(self, *args, **kwargs): return super(CollectionEpubView, self).dispatch(*args, **kwargs) -