heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #5514 - Add to Collection causes server error

Browse Source 
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.
This commit is contained in:
ayleph 2017-06-28 21:49:29 -07:00 committed by Andrew Browning
parent 5487c3b0d9
commit 763eae89d9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mediagoblin/user_pages/views.py
View File

@ -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,