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

Merge remote-tracking branch 'origin/master' into is315

Browse Source
This commit is contained in:
cfdv
2011-06-20 12:50:44 -05:00
parent cd95cb6d3d 5c441e75eb
commit 78c0744077
15 changed files with 160 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mediagoblin/edit/views.py
View File

@@ -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()