diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2012-03-15 12:35:58 +0100 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2012-03-15 12:35:58 +0100 |
| commit | 729424befd80ed34d486cf995499ce7a8bd0806f (patch) | |
| tree | 2c2858bd9217cd35a8badfd23fcf6eddf4066591 | |
| parent | 007ac2e72075b730719cab4e6b3af5d03f6f9473 (diff) | |
| download | mediagoblin-729424befd80ed34d486cf995499ce7a8bd0806f.tar.lz mediagoblin-729424befd80ed34d486cf995499ce7a8bd0806f.tar.xz mediagoblin-729424befd80ed34d486cf995499ce7a8bd0806f.zip | |
Fix media display for no media_data row in sql.
If there is no media_data row for the current media (for
whatever reason, there might be good ones), let
MediaEntry.media_data not raise an exception but just
return None.
The exif display part now handles this by checking whether
.media_data.exif is defined (None has no attribute exif, so
it's undefined, all fine).
| -rw-r--r-- | mediagoblin/db/sql/models.py | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/utils/exif.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/db/sql/models.py b/mediagoblin/db/sql/models.py index 394c35a3..a2feeebb 100644 --- a/mediagoblin/db/sql/models.py +++ b/mediagoblin/db/sql/models.py @@ -176,7 +176,7 @@ class MediaEntry(Base, MediaEntryMixin): session = Session() return session.query(self.media_data_table).filter_by( - media_entry=self.id).one() + media_entry=self.id).first() def media_data_init(self, **kwargs): """ diff --git a/mediagoblin/templates/mediagoblin/utils/exif.html b/mediagoblin/templates/mediagoblin/utils/exif.html index bd2e3307..3c1f4ceb 100644 --- a/mediagoblin/templates/mediagoblin/utils/exif.html +++ b/mediagoblin/templates/mediagoblin/utils/exif.html @@ -17,8 +17,8 @@ #} {% block exif_content %} - {% if media.media_data.has_key('exif') - and app_config['exif_visible'] + {% if app_config['exif_visible'] + and media.media_data.exif is defined and media.media_data.exif.has_key('useful') %} <h3 class="sidedata">EXIF</h3> <table> |