diff options
| author | Jef van Schendel <mail@jefvanschendel.nl> | 2012-01-05 00:17:51 +0100 |
|---|---|---|
| committer | Jef van Schendel <mail@jefvanschendel.nl> | 2012-01-05 00:17:51 +0100 |
| commit | a473deda9ab5ae3b12d386cafba70347a53b5136 (patch) | |
| tree | b70e11e40d0b10d2daa2995e6365ded8498bd8dc /mediagoblin/templates | |
| parent | c8071fa591ad148fbffdabc4d6dd71f5666c2172 (diff) | |
| parent | f1cdd278e7cf195e485567ed0d0d8a90cad81e48 (diff) | |
| download | mediagoblin-a473deda9ab5ae3b12d386cafba70347a53b5136.tar.lz mediagoblin-a473deda9ab5ae3b12d386cafba70347a53b5136.tar.xz mediagoblin-a473deda9ab5ae3b12d386cafba70347a53b5136.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 5 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/user.html | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 9b331789..4b5c9337 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -60,8 +60,9 @@ {% trans date=media.created.strftime("%Y-%m-%d") -%} Added on {{ date }}. {%- endtrans %} - {% if media['uploader'] == request.user._id or - request.user['is_admin'] %} + {% if request.user and + (media.uploader == request.user._id or + request.user.is_admin) %} {% set edit_url = request.urlgen('mediagoblin.edit.edit_media', user= media.get_uploader.username, media= media._id) %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index b952e88c..78bbaf8c 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -113,7 +113,8 @@ {% else %} <div class="grid_6 alpha"> {% include "mediagoblin/utils/profile.html" %} - {% if request.user._id == user._id or request.user.is_admin %} + {% if request.user and + (request.user._id == user._id or request.user.is_admin) %} <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{ user.username }}"> {%- trans %}Edit profile{% endtrans -%} |