link format ti item

diff --git a/telemeta/models/format.py b/telemeta/models/format.py
index ba82b6978f78995a273d281dabfe50a45eed9e72..b3ead7cede1e6d49850786078942a6b618c94cea 100644 (file)
--- a/telemeta/models/format.py
+++ b/telemeta/models/format.py
@@ -54,8 +54,8 @@ 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="item",
+    item                  = ForeignKey('MediaItem', related_name="format", verbose_name = _("item"))
+    original_format       = WeakForeignKey(OriginalFormat, related_name="format",
                                      verbose_name = _("original format"))
     original_code         = CharField(_('original code'), required=True)
     original_number       = CharField(_('original number'))
@@ -64,9 +64,9 @@ class Format(ModelCore):
     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'))
+    original_channels     = IntegerField(_("number of channels"))
+    original_audio_quality = TextField(_('audio quality'))
+    recording_system      = CharField(_('recording system'))
 
     # Tapes
     tape_wheel_diameter = WeakForeignKey(WheelDiameter, related_name="format",

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 45845791e5536da4bea6eacbf6828433b6324c73..3826c9bda0c42b3c58a46119c7ce23099337d528 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -352,7 +352,8 @@ class MediaItem(MediaResource):
                                         null=True, on_delete=models.SET_NULL)
     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")
+    public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES,
+                                      max_length=16, default="metadata")
     file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename")
 
     # Technical data

diff --git a/telemeta/templates/telemeta/profile_edit.html b/telemeta/templates/telemeta/profile_edit.html
index 3a64c7e541ad6e69df305007d39975a610b5b9d3..d0e6f96f76f532c264ea60fbf1431dad14b1b835 100644 (file)
--- a/telemeta/templates/telemeta/profile_edit.html
+++ b/telemeta/templates/telemeta/profile_edit.html
@@ -30,6 +30,6 @@
          <a href="#" class="component_icon button icon_save"
    onclick="document.getElementById('_editUserProfileForm').submit(); return false;">{% trans "Save" %}</a>
         </div>
-       </form>        
+       </form>
       </div>
 {% endblock %}