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

Merge remote-tracking branch 'jdshu/649_use_form_data_field'

Browse Source
This commit is contained in:
Christopher Allan Webber 2013-03-24 13:25:01 -05:00
commit 956a87322e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mediagoblin/user_pages/views.py
View File

@ -208,7 +208,7 @@ def media_collect(request, media):
# Make sure this user isn't duplicating an existing collection # Make sure this user isn't duplicating an existing collection
existing_collection = Collection.query.filter_by( existing_collection = Collection.query.filter_by(
creator=request.user.id, creator=request.user.id,
title=request.form['collection_title']).first() title=form.collection_title.data).first()
if existing_collection: if existing_collection:
messages.add_message(request, messages.ERROR, messages.add_message(request, messages.ERROR,
_('You already have a collection called "%s"!') _('You already have a collection called "%s"!')
@ -218,8 +218,8 @@ def media_collect(request, media):
media=media.slug_or_id) media=media.slug_or_id)
collection = Collection() collection = Collection()
collection.title = request.form['collection_title'] collection.title = form.collection_title.data
collection.description = request.form.get('collection_description') collection.description = form.collection_description.data
collection.creator = request.user.id collection.creator = request.user.id
collection.generate_slug() collection.generate_slug()
collection.save() collection.save()
@ -251,7 +251,7 @@ def media_collect(request, media):
collection_item = request.db.CollectionItem() collection_item = request.db.CollectionItem()
collection_item.collection = collection.id collection_item.collection = collection.id
collection_item.media_entry = media.id collection_item.media_entry = media.id
collection_item.note = request.form['note'] collection_item.note = form.note.data
collection_item.save() collection_item.save()
collection.items = collection.items + 1 collection.items = collection.items + 1