Changeset 91567b1

Timestamp:

05/22/12 19:40:32 (13 months ago)

Author:

yomguy <yomguy@…>

Branches:

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

Children:

39a8813

Parents:

cf7f390

git-author:

yomguy <yomguy@…> (05/22/12 19:40:32)

git-committer:

yomguy <yomguy@…> (05/22/12 19:40:32)

Message:

fix physical format

Location:

telemeta

Files:

• migrations/0017_auto__del_originalformat__del_channelnumber__add_numberofchannels__del.py (added)
• models/enum.py (modified) (2 diffs)
• models/format.py (modified) (2 diffs)

telemeta/models/enum.py

@@ -200 +200 @@
         verbose_name = _("tape vendor")
 
-
-# Original
-
-class ChannelNumber(Enumeration):
-    "Channel number"
+class NumberOfChannels(Enumeration):
+    "Number of channels"
 
     class Meta(MetaEnumeration):
@@ -210 +207 @@
         verbose_name = _("number of channels")
 
-class OriginalFormat(Enumeration):
-    "Item original format"
-
-    class Meta(MetaEnumeration):
-        db_table = 'original_format'
-        verbose_name = _("original format")
-
 class OriginalLocation(Enumeration):
-    "Item original location"
+    "Location of th original item or collection"
 
     class Meta(MetaEnumeration):

telemeta/models/format.py

@@ -56 +56 @@
     item                  = ForeignKey('MediaItem', related_name="format", verbose_name = _("item"),
                                        blank=True, null=True, on_delete=models.SET_NULL)
-    original_format       = WeakForeignKey(OriginalFormat, related_name="format",
-                                     verbose_name = _("original format"))
+    physical_format       = WeakForeignKey(PhysicalFormat, related_name="format",
+                                     verbose_name = _("physical format"))
     original_code         = CharField(_('original code'))
     original_number       = CharField(_('original number'))
@@ -65 +65 @@
     original_location     = WeakForeignKey(OriginalLocation, related_name="format",
                                         verbose_name = _("original location"))
-    original_channels     = WeakForeignKey(ChannelNumber, related_name="format",
+    original_channels     = WeakForeignKey(NumberOfChannels, related_name="format",
                                         verbose_name = _("number of channels"))
     original_audio_quality = TextField(_('audio quality'))