diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-01-16 11:06:22 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-01-16 11:06:22 -0600 |
| commit | 27aebe05a64862d552646b2b1e6c59fbe39ae1d5 (patch) | |
| tree | d62accc6165941be634f66578c3e82e85d9e7d22 /mediagoblin/user_pages | |
| parent | 4f8f0353b191c71dfa876b12621c573f98e10d1d (diff) | |
| parent | 461dd9717cce6c5b4d40bb4e76ca65d9d898d1df (diff) | |
| download | mediagoblin-27aebe05a64862d552646b2b1e6c59fbe39ae1d5.tar.lz mediagoblin-27aebe05a64862d552646b2b1e6c59fbe39ae1d5.tar.xz mediagoblin-27aebe05a64862d552646b2b1e6c59fbe39ae1d5.zip | |
Merge remote-tracking branch 'refs/remotes/elrond/misc/use_media_id'
Diffstat (limited to 'mediagoblin/user_pages')
| -rw-r--r-- | mediagoblin/user_pages/routing.py | 6 | ||||
| -rw-r--r-- | mediagoblin/user_pages/views.py | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 24bbab56..a9431405 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -24,12 +24,12 @@ add_route('mediagoblin.user_pages.media_home', 'mediagoblin.user_pages.views:media_home') add_route('mediagoblin.user_pages.media_confirm_delete', - '/u/<string:user>/m/<string:media>/confirm-delete/', + '/u/<string:user>/m/<int:media_id>/confirm-delete/', 'mediagoblin.user_pages.views:media_confirm_delete') # Submission handling of new comments. TODO: only allow for POST methods add_route('mediagoblin.user_pages.media_post_comment', - '/u/<string:user>/m/<string:media>/comment/add/', + '/u/<string:user>/m/<int:media_id>/comment/add/', 'mediagoblin.user_pages.views:media_post_comment') add_route('mediagoblin.user_pages.user_gallery', @@ -78,7 +78,7 @@ add_route('mediagoblin.user_pages.processing_panel', # Stray edit routes add_route('mediagoblin.edit.edit_media', - '/u/<string:user>/m/<string:media>/edit/', + '/u/<string:user>/m/<int:media_id>/edit/', 'mediagoblin.edit.views:edit_media') add_route('mediagoblin.edit.attachments', diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 0727b58a..b9f03e8e 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -28,6 +28,7 @@ from mediagoblin.user_pages import forms as user_forms from mediagoblin.user_pages.lib import send_comment_email from mediagoblin.decorators import (uses_pagination, get_user_media_entry, + get_media_entry_by_id, require_active_login, user_may_delete_media, user_may_alter_collection, get_user_collection, get_user_collection_item, active_user_from_url) @@ -138,7 +139,7 @@ def media_home(request, media, page, **kwargs): 'app_config': mg_globals.app_config}) -@get_user_media_entry +@get_media_entry_by_id @require_active_login def media_post_comment(request, media): """ @@ -258,7 +259,7 @@ def media_collect(request, media): #TODO: Why does @user_may_delete_media not implicate @require_active_login? -@get_user_media_entry +@get_media_entry_by_id @require_active_login @user_may_delete_media def media_confirm_delete(request, media): |