diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-03-04 15:47:05 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-03-04 15:47:05 -0600 |
| commit | f415c35b4ec5aebbc46bc6602a90ca29254838d6 (patch) | |
| tree | ad66f33756f393fbeca2e25864a1d969b0c4c8e1 /mediagoblin/user_pages/views.py | |
| parent | 99a54c0095ccadcebeb640cb20cb6eadb8b9a39d (diff) | |
| parent | f51a416778bc71ec373fac1cbfbf7df60815b68d (diff) | |
| download | mediagoblin-f415c35b4ec5aebbc46bc6602a90ca29254838d6.tar.lz mediagoblin-f415c35b4ec5aebbc46bc6602a90ca29254838d6.tar.xz mediagoblin-f415c35b4ec5aebbc46bc6602a90ca29254838d6.zip | |
Merge branch 'master' into 419_cherrypick_large_uploads
Diffstat (limited to 'mediagoblin/user_pages/views.py')
| -rw-r--r-- | mediagoblin/user_pages/views.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 69d7defb..dc562084 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -227,7 +227,8 @@ def media_collect(request, media): # Otherwise, use the collection selected from the drop-down else: collection = Collection.query.filter_by( - id=request.form.get('collection')).first() + id=form.collection.data, + creator=request.user.id).first() # Make sure the user actually selected a collection if not collection: @@ -236,7 +237,7 @@ def media_collect(request, media): _('You have to select or add a collection')) return redirect(request, "mediagoblin.user_pages.media_collect", user=media.get_uploader.username, - media=media.id) + media_id=media.id) # Check whether media already exists in collection @@ -250,7 +251,6 @@ def media_collect(request, media): collection_item = request.db.CollectionItem() collection_item.collection = collection.id collection_item.media_entry = media.id - collection_item.author = request.user.id collection_item.note = request.form['note'] collection_item.save() |