heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made changes according to http://bugs.foocorp.net/issues/363#note-5

Browse Source
This commit is contained in:
Joar Wandborg 2011-06-15 23:07:54 +02:00
parent 9e883ed3b2
commit 44e51d3464
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mediagoblin/edit/views.py
View File

@ -17,11 +17,13 @@
from webob import exc 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 import forms
from mediagoblin.edit.lib import may_edit_media from mediagoblin.edit.lib import may_edit_media
from mediagoblin.decorators import require_active_login, get_user_media_entry from mediagoblin.decorators import require_active_login, get_user_media_entry
import markdown
@get_user_media_entry @get_user_media_entry
@require_active_login @require_active_login
@ -49,11 +51,11 @@ def edit_media(request, media):
media['title'] = request.POST['title'] media['title'] = request.POST['title']
media['description'] = request.POST.get('description') media['description'] = request.POST.get('description')
import markdown
md = markdown.Markdown( md = markdown.Markdown(
safe_mode = 'escape') safe_mode = 'escape')
media['description_html'] = md.convert( media['description_html'] = clean_html(
media['description']) md.convert(
media['description']))
media['slug'] = request.POST['slug'] media['slug'] = request.POST['slug']
media.save() media.save()

10
mediagoblin/submit/views.py
View File

@ -19,11 +19,13 @@ from cgi import FieldStorage
from werkzeug.utils import secure_filename from werkzeug.utils import secure_filename
from mediagoblin.util import render_to_response, redirect from mediagoblin.util import render_to_response, redirect, clean_html
from mediagoblin.decorators import require_active_login from mediagoblin.decorators import require_active_login
from mediagoblin.submit import forms as submit_forms, security from mediagoblin.submit import forms as submit_forms, security
from mediagoblin.process_media import process_media_initial from mediagoblin.process_media import process_media_initial
import markdown
@require_active_login @require_active_login
def submit_start(request): def submit_start(request):
@ -49,11 +51,11 @@ def submit_start(request):
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'] = request.POST.get('description')
import markdown
md = markdown.Markdown( md = markdown.Markdown(
safe_mode = 'escape') safe_mode = 'escape')
entry['description_html'] = md.convert( entry['description_html'] = clean_html(
entry['description']) md.convert(
entry['description']))
entry['media_type'] = u'image' # heh entry['media_type'] = u'image' # heh
entry['uploader'] = request.user['_id'] entry['uploader'] = request.user['_id']