heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'JDShu/649_use_form_data_field'

Browse Source 
* JDShu/649_use_form_data_field:
  Use WTForms data field in user_pages/views.py
  Use WTForms data field in auth/views.py
  auth: whitespace cleanup in views.py
  Use WTForms data field in plugins/oauth/views.py
  Use WTForms data field in submit/views.py
  Use WTForms data field in edit/views.py
This commit is contained in:
Elrond
2013-03-30 14:42:45 +01:00
parent 047d8d5871 c5d341d79d
commit 4924b93bac
5 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mediagoblin/submit/views.py
View File

@@ -60,18 +60,18 @@ def submit_start(request):
entry = request.db.MediaEntry()
entry.media_type = unicode(media_type)
entry.title = (
unicode(request.form['title'])
unicode(submit_form.title.data)
or unicode(splitext(filename)[0]))
entry.description = unicode(request.form.get('description'))
entry.description = unicode(submit_form.description.data)
entry.license = unicode(request.form.get('license', "")) or None
entry.license = unicode(submit_form.license.data) or None
entry.uploader = request.user.id
# Process the user's folksonomy "tags"
entry.tags = convert_to_tag_list_of_dicts(
request.form.get('tags'))
submit_form.tags.data)
# Generate a slug from the title
entry.generate_slug()
@@ -125,8 +125,8 @@ def add_collection(request, media=None):
try:
collection = request.db.Collection()
collection.title = unicode(request.form['title'])
collection.description = unicode(request.form.get('description'))
collection.title = unicode(submit_form.title.data)
collection.description = unicode(submit_form.description.data)
collection.creator = request.user.id
collection.generate_slug()