Mount media editing under /u/{username}/m/{media}/edit/

diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
index 54f2661ac7734c2b62eac271b8332a4af4c35e7f..bf0b24987fc1816aa069fb6fd6c216cf51708b61 100644 (file)
--- a/mediagoblin/edit/routing.py
+++ b/mediagoblin/edit/routing.py
@@ -14,9 +14,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
 from routes.route import Route
 
 edit_routes = [
-    Route('mediagoblin.edit.edit_media', "/{user}/{media}/",
-        controller="mediagoblin.edit.views:edit_media"),
+    # Media editing view handled in user_pages/routing.py
 ]

diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py
index 96f97427273b1d495684685457b00b0830cbf446..c5e9a984b16b846d75004026525cb3e657d6e1e7 100644 (file)
--- a/mediagoblin/user_pages/routing.py
+++ b/mediagoblin/user_pages/routing.py
@@ -22,5 +22,7 @@ user_routes = [
     Route('mediagoblin.user_pages.media_home', '/{user}/m/{media}/',
         requirements=dict(m_id="[0-9a-fA-F]{24}"),
         controller="mediagoblin.user_pages.views:media_home"),
+    Route('mediagoblin.edit.edit_media', "/{user}/m/{media}/edit/",
+        controller="mediagoblin.edit.views:edit_media"),
     Route('mediagoblin.user_pages.atom_feed', '/{user}/atom/',
         controller="mediagoblin.user_pages.views:atom_feed")]