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/edit | |
| 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/edit')
| -rw-r--r-- | mediagoblin/edit/views.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index 57c9a118..3de71a64 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -17,11 +17,13 @@ from webob import exc -from mediagoblin.util import render_to_response, redirect +from mediagoblin.util import render_to_response, redirect, clean_html from mediagoblin.edit import forms from mediagoblin.edit.lib import may_edit_media from mediagoblin.decorators import require_active_login, get_user_media_entry +import markdown + @get_user_media_entry @require_active_login @@ -47,7 +49,14 @@ def edit_media(request, media): u'An entry with that slug already exists for this user.') else: media['title'] = request.POST['title'] - media['description'] = request.POST['description'] + media['description'] = request.POST.get('description') + + md = markdown.Markdown( + safe_mode = 'escape') + media['description_html'] = clean_html( + md.convert( + media['description'])) + media['slug'] = request.POST['slug'] media.save() |