Changeset b02f992


Ignore:
Timestamp:
05/02/12 16:31:24 (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
instru_search
Children:
49edfe4
Parents:
960da6e (diff), 03ca023 (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/02/12 16:31:24)
git-committer:
yomguy <yomguy@…> (05/02/12 16:31:24)
Message:

Merge branch 'master' into instru_search

Location:
telemeta
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/media.py

    r20ef7d8 r03ca023  
    349349    creator_reference     = CharField(_('reference')) 
    350350    original_format       = ForeignKey(Format, related_name="item", 
    351                                        verbose_name=_('orinal format'), blank=True, 
     351                                       verbose_name=_('original format'), blank=True, 
    352352                                        null=True, on_delete=models.SET_NULL) 
    353353    external_references   = TextField(_('published references')) 
  • telemeta/views/base.py

    r20ef7d8 r03ca023  
    660660            last_revision = None 
    661661 
    662         physical_format = item.format.physical_format 
     662        physical_format = item.original_format.original_format 
    663663 
    664664        return render(request, template, 
     
    14801480    subjects = settings.TELEMETA_SUBJECTS 
    14811481    tags = ['title', 'description', 'comment'] 
    1482     title = organization + ' - Telemeta - ' + ugettext('Last changes') 
     1482    title = organization.decode('utf8') + ' - Telemeta - ' + ugettext('Last changes') 
    14831483    link = "" 
    14841484    description = ' '.join([subject.decode('utf-8') for subject in subjects]) 
Note: See TracChangeset for help on using the changeset viewer.