Changeset b02f992

Timestamp:

05/02/12 16:31:24 (13 months 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:

• models/media.py (modified) (1 diff)
• views/base.py (modified) (2 diffs)

telemeta/models/media.py

@@ -349 +349 @@
     creator_reference     = CharField(_('reference'))
     original_format       = ForeignKey(Format, related_name="item",
-                                       verbose_name=_('orinal format'), blank=True,
+                                       verbose_name=_('original format'), blank=True,
                                         null=True, on_delete=models.SET_NULL)
     external_references   = TextField(_('published references'))

telemeta/views/base.py

@@ -660 +660 @@
             last_revision = None
 
-        physical_format = item.format.physical_format
+        physical_format = item.original_format.original_format
 
         return render(request, template,
@@ -1480 +1480 @@
     subjects = settings.TELEMETA_SUBJECTS
     tags = ['title', 'description', 'comment']
-    title = organization + ' - Telemeta - ' + ugettext('Last changes')
+    title = organization.decode('utf8') + ' - Telemeta - ' + ugettext('Last changes')
     link = ""
     description = ' '.join([subject.decode('utf-8') for subject in subjects])