Changeset 305d2e3 for telemeta/models/media.py

Timestamp:

05/25/12 16:36:58 (12 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, dev2, diadems, generic, lam, nlivemulti, release/1.4.4, storage

Children:

24b54bd

Parents:

d7de29b

git-author:

yomguy <yomguy@…> (05/25/12 16:36:58)

git-committer:

yomguy <yomguy@…> (05/25/12 16:36:58)

Message:

reorganize many models, add various item fields, add enums, add migr and trans

File:

• telemeta/models/media.py (modified) (2 diffs)

telemeta/models/media.py

@@ -312 +312 @@
     title                 = CharField(_('title'))
     alt_title             = CharField(_('original title / translation'))
-    collector             = CharField(_('recordist'))
     collection            = ForeignKey('MediaCollection', related_name="items",
                                        verbose_name=_('collection'))
     recorded_from_date    = DateField(_('recording date (from)'))
     recorded_to_date      = DateField(_('recording date (until)'))
+
+    scientist             = CharField(_('scientist'))
+    domain                = CharField(_('domain'))
+    summary               = TextField(_('summary'))
+    comment               = TextField(_('remarks'))
 
     # Geographic and cultural informations
@@ -337 +341 @@
                                            verbose_name=_('generic style'))
     author                = CharField(_('author / compositor'))
-
-    # General informations
-    comment               = TextField(_('remarks'))
-    collector_selection   = CharField(_('recordist selection'))
-    collector_from_collection = BooleanField(_('recordist as in collection'))
+    contributor           = CharField(_('contributor'))
+
+    # Legal mentions
+    organization          = WeakForeignKey('Organization', verbose_name=_('organization'))
+    public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES,
+                                      max_length=16, default="metadata")
+    depositor             = CharField(_('depositor'))
+    rights                = WeakForeignKey('Rights', verbose_name=_('rights'))
 
     # Archiving data
     code                  = CharField(_('code'), unique=True, blank=True)
-    old_code              = CharField(_('old code'), unique=False, blank=True)
+    old_code              = CharField(_('original code'), unique=False, blank=True)
     track                 = CharField(_('item number'))
-    creator_reference     = CharField(_('reference'))
+    recordist             = CharField(_('recordist'))
+    digitalist            = CharField(_('digitalist'))
+    collector             = CharField(_('collector'))
+    collector_selection   = CharField(_('collector selection'))
+    collector_from_collection = BooleanField(_('collector as in collection'))
+    digitization_date        = DateField(_('digitization date'))
+    publishing_date       = DateField(_('publishing date'))
+    creator_reference     = CharField(_('creator reference'))
     external_references   = TextField(_('published references'))
     copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of'))
-    public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES,
-                                      max_length=16, default="metadata")
+
+    # Media
     file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename")