From 7d16a01baea3251aaecf1aaba519b6549fcf0b5f Mon Sep 17 00:00:00 2001 From: Elrond Date: Thu, 17 Jan 2013 23:50:51 +0100 Subject: [PATCH] Fix linking to comments. when linking to a comment in a MediaEntry, the page did not contain a because, well: We fetched a string comment-id from the routing. And the pagination code tried to compare that to the int id on the comment. Fix is to let routing fetch an int from the url. Easy. Relatedly remove duplicated comment_id fetching from the URL in the view. --- mediagoblin/user_pages/routing.py | 2 +- mediagoblin/user_pages/views.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index a9431405..2b228355 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -37,7 +37,7 @@ add_route('mediagoblin.user_pages.user_gallery', 'mediagoblin.user_pages.views:user_gallery') add_route('mediagoblin.user_pages.media_home.view_comment', - '/u//m//c//', + '/u//m//c//', 'mediagoblin.user_pages.views:media_home') add_route('mediagoblin.user_pages.atom_feed', diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index d1ec23dc..dea47fbf 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -110,12 +110,13 @@ def media_home(request, media, page, **kwargs): """ 'Homepage' of a MediaEntry() """ - if request.matchdict.get('comment', None): + comment_id = request.matchdict.get('comment', None) + if comment_id: pagination = Pagination( page, media.get_comments( mg_globals.app_config['comments_ascending']), MEDIA_COMMENTS_PER_PAGE, - request.matchdict.get('comment')) + comment_id) else: pagination = Pagination( page, media.get_comments( -- 2.25.1