diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-19 20:00:35 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-19 20:00:35 -0500 |
| commit | 0692c01e4c7b88ce94fe023607109fb978c36c2e (patch) | |
| tree | c906a6068f9d3d5e84b1e66bf063e57bbbd70a47 /mediagoblin/edit/views.py | |
| parent | 079868489479550d9d8190cde6109cc39cd6272c (diff) | |
| parent | 44e51d3464e719e596e1480b7af2957742a9085b (diff) | |
| download | mediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.tar.lz mediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.tar.xz mediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.zip | |
Merge remote branch 'remotes/jwandborg/issue_363'
Conflicts:
setup.py
Diffstat (limited to 'mediagoblin/edit/views.py')
| -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 c5f0f435..6c16a61e 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() |