Changeset a7f10c1


Ignore:
Timestamp:
05/27/12 19:24:28 (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, generic, lam, lam2, mapsv3, merge, nlivemulti, release/1.4.4, sabiod, server, storage, telecaster
Children:
efa5176
Parents:
9ac0d41 (diff), 4e5ae69 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
yomguy <yomguy@…> (05/27/12 19:24:28)
git-committer:
yomguy <yomguy@…> (05/27/12 19:24:28)
Message:

Merge branch 'develop' into lam

Conflicts:

telemeta/templates/telemeta/mediaitem_detail.html

Location:
telemeta
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • telemeta/__init__.py

    raa83e80 ra7f10c1  
    1313 
    1414__docformat__ = 'epytext en' 
    15 __version__ = '1.4.3' 
     15__version__ = '1.4.4' 
    1616__url__ = 'http://telemeta.org' 
    1717__copyright__ = '(C) 2007-2012 Parisson' 
  • telemeta/admin.py

    r6b3e6e5 r752ebd9  
    7777 
    7878class FormatAdmin(admin.ModelAdmin): 
    79     search_fields = ['code', 'vendor', 'item__code'] 
     79    search_fields = ['original_code', 'tape_reference'] 
    8080 
    8181class UserProfileInline(admin.StackedInline): 
  • telemeta/models/format.py

    r305d2e3 r9fa4646  
    5454    """ Physical format object as proposed by the LAM""" 
    5555 
     56    element_type          = 'format' 
     57 
    5658    item                  = ForeignKey('MediaItem', related_name="format", verbose_name = _("item"), 
    5759                                       blank=True, null=True, on_delete=models.SET_NULL) 
     
    8890    def __unicode__(self): 
    8991        if self.physical_format: 
    90             return self.physical_format.value 
     92            return ' - '.join([self.physical_format.value, self.original_code, 
     93                               self.item.public_id]) 
    9194        else: 
    9295            return 'Unknown' 
  • telemeta/templates/telemeta/mediaitem_detail.html

    r9ac0d41 ra7f10c1  
    191191            {% dl_field item "title" placeholder %} 
    192192            {% dl_field item "alt_title" %} 
    193  
    194  
    195193            {% dl_field item "collector" placeholder %} 
    196194            <dt>{% field_label item "collection" %}</dt> 
  • telemeta/views/base.py

    r57fd750 r4e5ae69  
    226226            sound_pub_items = None 
    227227 
    228         revisions = get_revisions(4) 
     228        revisions = get_revisions(25) 
    229229        context = RequestContext(request, { 
    230230                    'page_content': pages.get_page_content(request, 'home', ignore_slash_issue=True), 
Note: See TracChangeset for help on using the changeset viewer.