diff options
| author | cfdv <caldavis@gmail.com> | 2011-06-20 12:50:44 -0500 |
|---|---|---|
| committer | cfdv <caldavis@gmail.com> | 2011-06-20 12:50:44 -0500 |
| commit | 78c0744077b58fb4c20a965fdbbb52055922d793 (patch) | |
| tree | 8ba6033b3f7d8e19c78f59dca2db8ee97872647c /mediagoblin/submit/views.py | |
| parent | cd95cb6d3d6ffa403be5f2b347862929917aa1e3 (diff) | |
| parent | 5c441e75ebc4ad63c3a5362d9bc451abe97984d2 (diff) | |
| download | mediagoblin-78c0744077b58fb4c20a965fdbbb52055922d793.tar.lz mediagoblin-78c0744077b58fb4c20a965fdbbb52055922d793.tar.xz mediagoblin-78c0744077b58fb4c20a965fdbbb52055922d793.zip | |
Merge remote-tracking branch 'origin/master' into is315
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'] |