diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-12-04 23:14:08 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-12-04 23:14:08 -0600 |
| commit | 04b0b7a124130fe4db082c419e6f44a5a212ffab (patch) | |
| tree | 257c51b90aa86810efb839c0ad9af3bb3eb758c2 /mediagoblin/templates | |
| parent | a085dda5d29a1353eaf7df3ddfc3a7c500af9186 (diff) | |
| parent | 707001950a42c7adfd6657f227a2c2dbbd09afce (diff) | |
| download | mediagoblin-04b0b7a124130fe4db082c419e6f44a5a212ffab.tar.lz mediagoblin-04b0b7a124130fe4db082c419e6f44a5a212ffab.tar.xz mediagoblin-04b0b7a124130fe4db082c419e6f44a5a212ffab.zip | |
Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'
Conflicts:
mediagoblin/decorators.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 4 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index caa99eb7..c7818012 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -120,13 +120,13 @@ <p> {% set edit_url = request.urlgen('mediagoblin.edit.edit_media', user= media.get_uploader().username, - media= media._id) %} + media= media.slug) %} <a href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a> </p> <p> {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete', user= media.get_uploader().username, - media= media._id) %} + media= media.slug) %} <a href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a> </p> {% endif %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html index 058351a5..e36891d6 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.get_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> |