diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-20 16:33:14 +0200 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-20 16:33:14 +0200 |
| commit | 2d1f91cc41aca908502ea1d18687b902a5fd90a1 (patch) | |
| tree | 1d6d425a8ec7a7bfb8490c88d87806d856336d1e /mediagoblin/submit/views.py | |
| parent | 76e21adbd8756159d83bef99b335398519b338f3 (diff) | |
| parent | 5c441e75ebc4ad63c3a5362d9bc451abe97984d2 (diff) | |
| download | mediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.tar.lz mediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.tar.xz mediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.zip | |
Merge remote-tracking branch 'gitorious/master'
Diffstat (limited to 'mediagoblin/submit/views.py')
| -rw-r--r-- | mediagoblin/submit/views.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index e9b5c37e..6139614e 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -19,7 +19,8 @@ from cgi import FieldStorage from werkzeug.utils import secure_filename -from mediagoblin.util import render_to_response, redirect +from mediagoblin.util import ( + render_to_response, redirect, cleaned_markdown_conversion) from mediagoblin.decorators import require_active_login from mediagoblin.submit import forms as submit_forms, security from mediagoblin.process_media import process_media_initial @@ -46,8 +47,14 @@ def submit_start(request): # create entry and save in database entry = request.db.MediaEntry() - entry['title'] = request.POST['title'] or unicode(splitext(filename)[0]) + entry['title'] = ( + request.POST['title'] + or unicode(splitext(filename)[0])) + entry['description'] = request.POST.get('description') + entry['description_html'] = cleaned_markdown_conversion( + entry['description']) + entry['media_type'] = u'image' # heh entry['uploader'] = request.user['_id'] |