Prepare for moving /edit/ under /u/.../edit/

To make moving the whole thing under /u/ easier, prepare to
pass in the {user} needed for that.

diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
index d7396a60a62ee59ef634cc0d65c69198e37a7bee..54f2661ac7734c2b62eac271b8332a4af4c35e7f 100644 (file)
--- a/mediagoblin/edit/routing.py
+++ b/mediagoblin/edit/routing.py
@@ -17,6 +17,6 @@
 from routes.route import Route
 
 edit_routes = [
-    Route('mediagoblin.edit.edit_media', "/{media}/",
+    Route('mediagoblin.edit.edit_media', "/{user}/{media}/",
         controller="mediagoblin.edit.views:edit_media"),
 ]

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index e5dccc8114a1f63235c0c5be8eac001381179469..a0afaa3062e482fd1a880a284c6b9c0e1a91c931 100644 (file)
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -3,7 +3,7 @@
 from webob import Response, exc
 
 from mediagoblin.edit import forms
-from mediagoblin.decorators import require_active_login, get_media_entry_by_id
+from mediagoblin.decorators import require_active_login, get_user_media_entry
 
 
 def may_edit_media(request, media):
@@ -15,7 +15,7 @@ def may_edit_media(request, media):
     return False
     
 
-@get_media_entry_by_id
+@get_user_media_entry
 @require_active_login
 def edit_media(request, media):
     if not may_edit_media(request, media):

diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html
index d694ce25beb5ce6501c943b5ae4fe34acab2944d..295d57eb82e03fca7f32921b69d12949b3530878 100644 (file)
--- a/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@ -23,6 +23,7 @@
   <h1>Edit details for {{ media.title }}</h1>
 
   <form action="{{ request.urlgen('mediagoblin.edit.edit_media',
+                               user= media.uploader().username,
                                media= media._id) }}"
         method="POST" enctype="multipart/form-data">
     <div class="submit_box form_box">

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index b26e251448cf08ff4edeefb219e06d0c75b7f309..406fd3f6a7c8dbfb75a007b1a54f35281321559b 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -34,6 +34,7 @@
                                user= media.uploader().username) }}">
       {{- media.uploader().username }}</a></p>
     <p><a href="{{ request.urlgen('mediagoblin.edit.edit_media',
+                               user= media.uploader().username,
                                media= media._id) }}">Edit</a></p>
   {% else %}
   <p>Sorry, no such media found.<p/>