From 763eae89d9c13459a9e8ef1de384a7025d5820dd Mon Sep 17 00:00:00 2001 From: ayleph Date: Wed, 28 Jun 2017 21:49:29 -0700 Subject: [PATCH] Fix #5514 - Add to Collection causes server error Re-arrange code to check whether a collection has been selected prior to checking whether an item already exists in the selected collection. This fixes a regression introduced in 0f3bf8d. --- mediagoblin/user_pages/views.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index ab235695..b4737ea8 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -297,12 +297,6 @@ def media_collect(request, media): collection = None # Make sure the user actually selected a collection - item = CollectionItem.query.filter_by(collection=collection.id) - item = item.join(CollectionItem.object_helper).filter_by( - model_type=media.__tablename__, - obj_pk=media.id - ).first() - if not collection: messages.add_message( request, @@ -312,8 +306,14 @@ def media_collect(request, media): user=media.get_actor.username, media_id=media.id) + item = CollectionItem.query.filter_by(collection=collection.id) + item = item.join(CollectionItem.object_helper).filter_by( + model_type=media.__tablename__, + obj_pk=media.id + ).first() + # Check whether media already exists in collection - elif item is not None: + if item is not None: messages.add_message( request, messages.ERROR,