aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoar Wandborg <joar@wandborg.se>2013-02-18 14:41:34 +0100
committerJoar Wandborg <joar@wandborg.se>2013-02-18 14:41:34 +0100
commit61e39d90e58b8cea5c837d6da5731ab42127c642 (patch)
treecb0bafb7b9396ae36e707035fb778cfbeb3fee9e
parentab9b0b4175f3d00885866a454c9fbb93a06ee155 (diff)
downloadmediagoblin-61e39d90e58b8cea5c837d6da5731ab42127c642.tar.lz
mediagoblin-61e39d90e58b8cea5c837d6da5731ab42127c642.tar.xz
mediagoblin-61e39d90e58b8cea5c837d6da5731ab42127c642.zip
Fix errors in collection views
When a collection does not exist, render the 404 page.
-rw-r--r--mediagoblin/user_pages/views.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 811d3578..0225b6d7 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -309,6 +309,9 @@ def user_collection(request, page, url_user=None):
get_creator=url_user,
slug=request.matchdict['collection']).first()
+ if not collection:
+ return render_404(request)
+
cursor = collection.get_collection_items()
pagination = Pagination(page, cursor)
@@ -515,6 +518,8 @@ def collection_atom_feed(request):
collection = Collection.query.filter_by(
creator=user.id,
slug=request.matchdict['collection']).first()
+ if not collection:
+ return render_404(request)
cursor = CollectionItem.query.filter_by(
collection=collection.id) \