Changeset 49edfe4


Ignore:
Timestamp:
May 2, 2012 4:33:40 PM (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
instru_search
Parents:
b02f992 (diff), 57305a5 (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@…> (02/05/2012 16:33:40)
git-committer:
yomguy <yomguy@…> (02/05/2012 16:33:40)
Message:

Merge branch 'master' into instru_search

Location:
telemeta
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/format.py

    rc8cdfbe r57305a5  
    8383 
    8484    def __unicode__(self): 
    85         return self.original_code 
     85        return self.original_format 
    8686 
    8787    @property 
  • telemeta/views/base.py

    r03ca023 r57305a5  
    660660            last_revision = None 
    661661 
    662         physical_format = item.original_format.original_format 
     662        physical_format = item.original_format 
    663663 
    664664        return render(request, template, 
Note: See TracChangeset for help on using the changeset viewer.