Changeset 49edfe4

Timestamp:

05/02/12 16:33:40 (13 months 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@…> (05/02/12 16:33:40)

git-committer:

yomguy <yomguy@…> (05/02/12 16:33:40)

Message:

Merge branch 'master' into instru_search

Location:

telemeta

Files:

• models/format.py (modified) (1 diff)
• views/base.py (modified) (1 diff)

telemeta/models/format.py

@@ -83 +83 @@
 
     def __unicode__(self):
-        return self.original_code
+        return self.original_format
 
     @property

telemeta/views/base.py

@@ -660 +660 @@
             last_revision = None
 
-        physical_format = item.original_format.original_format
+        physical_format = item.original_format
 
         return render(request, template,