aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-03-24 13:25:01 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-03-24 13:25:01 -0500
commit956a87322e725e77bc8fa4435e764dd3e91711ef (patch)
tree5ea691873727356b34cd1c952968009e1e5ddd0f
parentdb9ab08a11b8261905a9f529006b2c1b1bb82c09 (diff)
parent2263a4cb5ccc7a0c931e7b7e00ad727e2253d161 (diff)
downloadmediagoblin-956a87322e725e77bc8fa4435e764dd3e91711ef.tar.lz
mediagoblin-956a87322e725e77bc8fa4435e764dd3e91711ef.tar.xz
mediagoblin-956a87322e725e77bc8fa4435e764dd3e91711ef.zip
Merge remote-tracking branch 'jdshu/649_use_form_data_field'
-rw-r--r--mediagoblin/user_pages/views.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index c611daa1..09ec7df9 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -208,7 +208,7 @@ def media_collect(request, media):
# Make sure this user isn't duplicating an existing collection
existing_collection = Collection.query.filter_by(
creator=request.user.id,
- title=request.form['collection_title']).first()
+ title=form.collection_title.data).first()
if existing_collection:
messages.add_message(request, messages.ERROR,
_('You already have a collection called "%s"!')
@@ -218,8 +218,8 @@ def media_collect(request, media):
media=media.slug_or_id)
collection = Collection()
- collection.title = request.form['collection_title']
- collection.description = request.form.get('collection_description')
+ collection.title = form.collection_title.data
+ collection.description = form.collection_description.data
collection.creator = request.user.id
collection.generate_slug()
collection.save()
@@ -251,7 +251,7 @@ def media_collect(request, media):
collection_item = request.db.CollectionItem()
collection_item.collection = collection.id
collection_item.media_entry = media.id
- collection_item.note = request.form['note']
+ collection_item.note = form.note.data
collection_item.save()
collection.items = collection.items + 1