aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/edit/routing.py4
-rw-r--r--mediagoblin/user_pages/routing.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
index 54f2661a..bf0b2498 100644
--- 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 96f97427..c5e9a984 100644
--- 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")]