diff options
| author | lora <lorochka85@gmail.com> | 2011-11-19 17:00:25 -0600 |
|---|---|---|
| committer | lora <lorochka85@gmail.com> | 2011-11-19 17:00:25 -0600 |
| commit | 2d62e9efd210becd30982e65e06a6ef97029b391 (patch) | |
| tree | 8382b36d9a2f97b809f66f7404c36acfc7873be4 | |
| parent | 917d4663afedded7e6606b1a799771da8dc2a37c (diff) | |
| download | mediagoblin-2d62e9efd210becd30982e65e06a6ef97029b391.tar.lz mediagoblin-2d62e9efd210becd30982e65e06a6ef97029b391.tar.xz mediagoblin-2d62e9efd210becd30982e65e06a6ef97029b391.zip | |
issue 582: use media.slug instead of media.id
| -rw-r--r-- | mediagoblin/decorators.py | 3 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 4 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index 19e22bca..38f52ced 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -58,7 +58,7 @@ def user_may_delete_media(controller): """ def wrapper(request, *args, **kwargs): uploader = request.db.MediaEntry.find_one( - {'_id': ObjectId(request.matchdict['media'])}).uploader() + {'slug': request.matchdict['media'] }).uploader() if not (request.user['is_admin'] or request.user['_id'] == uploader['_id']): return exc.HTTPForbidden() @@ -95,7 +95,6 @@ def get_user_media_entry(controller): if not user: return render_404(request) - media = request.db.MediaEntry.find_one( {'slug': request.matchdict['media'], 'state': 'processed', diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 433f74dc..5e1b73de 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -124,7 +124,7 @@ <p> {% set edit_url = request.urlgen('mediagoblin.edit.edit_media', user= media.uploader().username, - media= media._id) %} + media= media.slug) %} <a href="{{ edit_url }}" ><img src="{{ request.staticdirect('/images/icon_edit.png') }}" class="media_icon" /></a> @@ -133,7 +133,7 @@ <p> {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete', user= media.uploader().username, - media= media._id) %} + media= media.slug) %} <a href="{{ delete_url }}" ><img src="{{ request.staticdirect('/images/icon_delete.png') }}" class="media_icon" /></a> diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html index dd6923a9..f62082bd 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html @@ -23,7 +23,7 @@ <form action="{{ request.urlgen('mediagoblin.user_pages.media_confirm_delete', user=media.uploader().username, - media=media._id) }}" + media=media.slug) }}" method="POST" enctype="multipart/form-data"> <div class="grid_8 prefix_1 suffix_1 edit_box form_box"> <h1> |