Changeset 39a8813

Timestamp:

05/24/12 15:07:12 (13 months ago)

Author:

yomguy <yomguy@…>

Branches:

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

Children:

71a8bde

Parents:

91567b1

git-author:

yomguy <yomguy@…> (05/24/12 15:07:12)

git-committer:

yomguy <yomguy@…> (05/24/12 15:07:12)

Message:

fix physical format

Location:

telemeta

Files:

• models/media.py (modified) (3 diffs)
• templates/telemeta/mediaitem_detail.html (modified) (1 diff)

telemeta/models/media.py

@@ -520 +520 @@
 class PlaylistResource(ModelCore):
     "Playlist components"
-    RESOURCE_TYPE_CHOICES = (('item', 'item'), ('collection', 'collection'), ('marker', 'marker'), ('fonds', 'fonds'), ('corpus', 'corpus'))
+    RESOURCE_TYPE_CHOICES = (('item', 'item'), ('collection', 'collection'),
+                             ('marker', 'marker'), ('fonds', 'fonds'), ('corpus', 'corpus'))
     element_type = 'playlist_resource'
     public_id          = CharField(_('public_id'), required=True)
@@ -639 +640 @@
     children_type = 'collections'
 
-    children = models.ManyToManyField(MediaCollection, related_name="corpus", verbose_name=_('collections'),  blank=True, null=True)
+    children = models.ManyToManyField(MediaCollection, related_name="corpus",
+                                      verbose_name=_('collections'),  blank=True, null=True)
     recorded_from_year    = IntegerField(_('recording year (from)'))
     recorded_to_year      = IntegerField(_('recording year (until)'))
@@ -661 +663 @@
     children_type = 'corpus'
 
-    children = models.ManyToManyField(MediaCorpus, related_name="fonds", verbose_name=_('corpus'), blank=True, null=True)
+    children = models.ManyToManyField(MediaCorpus, related_name="fonds",
+                                      verbose_name=_('corpus'), blank=True, null=True)
 
     objects = MediaFondsManager()

telemeta/templates/telemeta/mediaitem_detail.html

@@ -304 +304 @@
 
                     {% if format %}
-                     {% dl_field format "original_format" %}
+                     {% dl_field format "physical_format" %}
                      {% dl_field format "original_code" %}
                      {% dl_field format "original_number" %}