From 981485e85bda524d657236ef689fb87118baaa23 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 17 Dec 2014 00:28:58 +0100 Subject: [PATCH] readd old fields for clean data migration --- telemeta/forms/media.py | 1 + ...iacorpus_descriptions__add_field_mediafonds_descrip.py | 8 +++++--- telemeta/models/media.py | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/telemeta/forms/media.py b/telemeta/forms/media.py index 12ea5173..72f08c0a 100644 --- a/telemeta/forms/media.py +++ b/telemeta/forms/media.py @@ -82,6 +82,7 @@ class MediaCollectionForm(ModelForm): class Meta: model = MediaCollection + exclude = ['alt_ids', 'travail'] def clean_doctype_code(self): return self.cleaned_data['doctype_code'] or 0 diff --git a/telemeta/migrations/0030_auto__add_field_mediacorpus_descriptions__add_field_mediafonds_descrip.py b/telemeta/migrations/0030_auto__add_field_mediacorpus_descriptions__add_field_mediafonds_descrip.py index ef0ff146..c5dc2393 100644 --- a/telemeta/migrations/0030_auto__add_field_mediacorpus_descriptions__add_field_mediafonds_descrip.py +++ b/telemeta/migrations/0030_auto__add_field_mediacorpus_descriptions__add_field_mediafonds_descrip.py @@ -20,10 +20,12 @@ class Migration(SchemaMigration): if not db.dry_run: from telemeta.models import MediaFonds, MediaCorpus - for corpus in MediaCorpus.objects.all(): - corpus.descriptions = corpus.description - corpus.save() + if hasattr(MediaCorpus, 'description'): + for corpus in MediaCorpus.objects.all(): + corpus.descriptions = corpus.description + corpus.save() + if hasattr(MediaFonds, 'description'): for fonds in MediaFonds.objects.all(): fonds.descriptions = fonds.description fonds.save() diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 2a3875bf..9374d407 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -123,6 +123,7 @@ class MediaBaseResource(MediaResource): "Describe a media base resource" title = CharField(_('title'), required=True) + description = CharField(_('description_old')) descriptions = TextField(_('description')) code = CharField(_('code'), unique=True, required=True) public_access = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, max_length=16, default="metadata") @@ -254,6 +255,10 @@ class MediaCollection(MediaResource): physical_format = WeakForeignKey('PhysicalFormat', related_name="collections", verbose_name=_('archive format')) ad_conversion = WeakForeignKey('AdConversion', related_name='collections', verbose_name=_('digitization')) + # No more used old fields + alt_ids = CharField(_('copies (obsolete field)')) + travail = CharField(_('archiver notes (obsolete field)')) + # All objects = MediaCollectionManager() -- 2.39.5