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

655: Fix collection fetching for media_collect()

Browse Source 
The problem is:

    Collection.query.filter_by(id=X, ...)

1. X = form.collection.data
   This works nicely for the completely empty form (X = None).
   It does not work for a selected collection, because X
   will be the collection, not its id.

2. X = request.form.get('collection') (old code).
   This one works mostly, except for the completely empty
   form on postgres, because in this case X = u"__None" and
   postgres does not like comparing an integer column with
   a string.

Fix:
    collection = form.collection.data
    if collection and collection.creator != request.user.id:
        collection = None
This commit is contained in:
Elrond 2013-03-10 20:56:48 +01:00
parent 8da8449332
commit e9330b9552
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/user_pages/views.py
View File

@ -226,9 +226,9 @@ def media_collect(request, media):
# Otherwise, use the collection selected from the drop-down # Otherwise, use the collection selected from the drop-down
else: else:
collection = Collection.query.filter_by( collection = form.collection.data
id=form.collection.data, if collection and collection.creator != request.user.id:
creator=request.user.id).first() collection = None
# Make sure the user actually selected a collection # Make sure the user actually selected a collection
if not collection: if not collection: