oops, format regression..

diff --git a/telemeta/models/format.py b/telemeta/models/format.py
index 606702aa66ca8912cfb184263780f5d543d47e4c..ba82b6978f78995a273d281dabfe50a45eed9e72 100644 (file)
--- a/telemeta/models/format.py
+++ b/telemeta/models/format.py
@@ -54,30 +54,31 @@ from django.db import models
 class Format(ModelCore):
     """ Physical format object as proposed by the LAM"""
 
-    item            = ForeignKey(Item, related_name="format",
-                                     verbose_name = _("item") )
-    original_format = WeakForeignKey(OriginalFormat, related_name="format",
+    item            = ForeignKey(Item, related_name="format", verbose_name = _("item"))
+    original_format       = WeakForeignKey(OriginalFormat, related_name="item",
                                      verbose_name = _("original format"))
-    original_code = CharField(_('original code'), required=True)
-    original_format_number = CharField(_('original format number'))
-    status = CharField(_('status'))
-    conservation_state = TextField(_('technical properties / conservation state'))
-    comments = TextField(_('comments / notes'))
+    original_code         = CharField(_('original code'), required=True)
+    original_number       = CharField(_('original number'))
+    original_status       = CharField(_('status'))
+    original_state        = TextField(_('technical properties / conservation state'))
+    original_comments     = TextField(_('comments / notes'))
+    original_location     = WeakForeignKey(OriginalLocation, related_name="format",
+                                        verbose_name = _("original location"))
+    original_channels            = IntegerField(_("number of channels"))
+    audio_quality       = TextField(_('audio quality'))
+    recording_system    = CharField(_('recording system'))
 
     # Tapes
-    wheel_diameter = WeakForeignKey(WheelDiameter, related_name="format",
-                                    verbose_name = _("tape wheel diameter"))
-    tape_width  = WeakForeignKey(TapeWidth, related_name="format",
-                                 verbose_name = _("tape width (inch)"))
-    tape_thickness = CharField(_('tape thickness (um)'))
-    tape_diameter = CharField(_('tape diameter (mm)'))
-    tape_speed = WeakForeignKey(TapeSpeed, related_name="format", verbose_name = _("tape speed (m/s)"))
-    tape_vendor = WeakForeignKey(TapeVendor, related_name="format", verbose_name = _("tape vendor"))
-    tape_reference = CharField(_('tape reference'))
-    sticker_presence = BooleanField(_('sticker presence'))
-    recording_system = CharField(_('recording system'))
-    channels = IntegerField(_("number of channels"))
-    audio_quality = TextField(_('audio quality'))
+    tape_wheel_diameter = WeakForeignKey(WheelDiameter, related_name="format",
+                                        verbose_name = _("tape wheel diameter (cm)"))
+    tape_thickness      = CharField(_('tape thickness (um)'))
+    tape_speed          = WeakForeignKey(TapeSpeed, related_name="format",
+                                        verbose_name = _("tape speed (m/s)"))
+    tape_vendor         = WeakForeignKey(TapeVendor, related_name="format",
+                                        verbose_name = _("tape vendor"))
+    tape_reference      = CharField(_('tape reference'))
+    sticker_presence    = BooleanField(_('sticker presence'))
+
 
     class Meta(MetaCore):
         db_table = 'media_formats'