Merge remote-tracking branch 'gitorious/master'

2 files changed, 15 insertions, 17 deletions

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")]
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index cc9c7b21..323c3e54 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.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 webob import Response, exc
+from webob import exc
 from mediagoblin.db.util import DESCENDING
-from mediagoblin.util import Pagination
+from mediagoblin.util import Pagination, render_to_response
 
 from mediagoblin.decorators import uses_pagination, get_user_media_entry
 
@@ -42,26 +42,22 @@ def user_home(request, page):
     if media_entries == None:
         return exc.HTTPNotFound()
     
-    template = request.template_env.get_template(
-        'mediagoblin/user_pages/user.html')
-
-    return Response(
-        template.render(
-            {'request': request,
-             'user': user,
-             'media_entries': media_entries,
-             'pagination': pagination}))
+    return render_to_response(
+        request,
+        'mediagoblin/user_pages/user.html',
+        {'user': user,
+         'media_entries': media_entries,
+         'pagination': pagination})
 
 
 @get_user_media_entry
 def media_home(request, media):
     """'Homepage' of a MediaEntry()"""
-    template = request.template_env.get_template(
-        'mediagoblin/user_pages/media.html')
-    return Response(
-        template.render(
-            {'request': request,
-             'media': media}))
+    return render_to_response(
+        request,
+        'mediagoblin/user_pages/media.html',
+        {'media': media})
+
 
 ATOM_DEFAULT_NR_OF_UPDATED_ITEMS = 5