Changeset 39a8813


Ignore:
Timestamp:
May 24, 2012 3:07:12 PM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, crem3, dev, dev2, diadems, dj1.6, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, generic, lam, lam2, mapsv3, merge, nlivemulti, release/1.4.4, sabiod, search, server, storage, telecaster
Children:
71a8bde
Parents:
91567b1
git-author:
yomguy <yomguy@…> (24/05/2012 15:07:12)
git-committer:
yomguy <yomguy@…> (24/05/2012 15:07:12)
Message:

fix physical format

Location:
telemeta
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/media.py

    rf38d30a r39a8813  
    520520class PlaylistResource(ModelCore): 
    521521    "Playlist components" 
    522     RESOURCE_TYPE_CHOICES = (('item', 'item'), ('collection', 'collection'), ('marker', 'marker'), ('fonds', 'fonds'), ('corpus', 'corpus')) 
     522    RESOURCE_TYPE_CHOICES = (('item', 'item'), ('collection', 'collection'), 
     523                             ('marker', 'marker'), ('fonds', 'fonds'), ('corpus', 'corpus')) 
    523524    element_type = 'playlist_resource' 
    524525    public_id          = CharField(_('public_id'), required=True) 
     
    639640    children_type = 'collections' 
    640641 
    641     children = models.ManyToManyField(MediaCollection, related_name="corpus", verbose_name=_('collections'),  blank=True, null=True) 
     642    children = models.ManyToManyField(MediaCollection, related_name="corpus", 
     643                                      verbose_name=_('collections'),  blank=True, null=True) 
    642644    recorded_from_year    = IntegerField(_('recording year (from)')) 
    643645    recorded_to_year      = IntegerField(_('recording year (until)')) 
     
    661663    children_type = 'corpus' 
    662664 
    663     children = models.ManyToManyField(MediaCorpus, related_name="fonds", verbose_name=_('corpus'), blank=True, null=True) 
     665    children = models.ManyToManyField(MediaCorpus, related_name="fonds", 
     666                                      verbose_name=_('corpus'), blank=True, null=True) 
    664667 
    665668    objects = MediaFondsManager() 
  • telemeta/templates/telemeta/mediaitem_detail.html

    rc89e8e54 r39a8813  
    304304 
    305305                    {% if format %} 
    306                      {% dl_field format "original_format" %} 
     306                     {% dl_field format "physical_format" %} 
    307307                     {% dl_field format "original_code" %} 
    308308                     {% dl_field format "original_number" %} 
Note: See TracChangeset for help on using the changeset viewer.