From 44e2da2fe60a3b8765d0fef5a9ce0c3e5997dd01 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Sun, 12 Jun 2011 03:24:31 +0200 Subject: Added Markdown rendering for `media_entry` --- mediagoblin/submit/views.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'mediagoblin/submit/views.py') diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index e9b5c37e..21562e6f 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -48,6 +48,13 @@ def submit_start(request): entry = request.db.MediaEntry() entry['title'] = request.POST['title'] or unicode(splitext(filename)[0]) entry['description'] = request.POST.get('description') + + import markdown + md = markdown.Markdown( + safe_mode = 'escape') + entry['description_html'] = md.convert( + entry['description']) + entry['media_type'] = u'image' # heh entry['uploader'] = request.user['_id'] -- cgit v1.2.3 From 44e51d3464e719e596e1480b7af2957742a9085b Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Wed, 15 Jun 2011 23:07:54 +0200 Subject: Made changes according to http://bugs.foocorp.net/issues/363#note-5 --- mediagoblin/submit/views.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'mediagoblin/submit/views.py') diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index 21562e6f..437a5a51 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -19,11 +19,13 @@ 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, clean_html from mediagoblin.decorators import require_active_login from mediagoblin.submit import forms as submit_forms, security from mediagoblin.process_media import process_media_initial +import markdown + @require_active_login def submit_start(request): @@ -49,11 +51,11 @@ def submit_start(request): entry['title'] = request.POST['title'] or unicode(splitext(filename)[0]) entry['description'] = request.POST.get('description') - import markdown md = markdown.Markdown( safe_mode = 'escape') - entry['description_html'] = md.convert( - entry['description']) + entry['description_html'] = clean_html( + md.convert( + entry['description'])) entry['media_type'] = u'image' # heh entry['uploader'] = request.user['_id'] -- cgit v1.2.3 From 4bf8e8888c7df6717eb43487136cc9d5c155bc6c Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 19 Jun 2011 20:41:40 -0500 Subject: Adds util.cleaned_markdown_conversion() and uses it in the submission process This simplifies the markdown processing & html cleaning of descritions and etc by providing a wrapper function that we can use in multiple locations. --- mediagoblin/submit/views.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'mediagoblin/submit/views.py') diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index 437a5a51..6139614e 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -19,13 +19,12 @@ from cgi import FieldStorage from werkzeug.utils import secure_filename -from mediagoblin.util import render_to_response, redirect, clean_html +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 -import markdown - @require_active_login def submit_start(request): @@ -48,14 +47,13 @@ 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') - - md = markdown.Markdown( - safe_mode = 'escape') - entry['description_html'] = clean_html( - md.convert( - entry['description'])) + entry['description_html'] = cleaned_markdown_conversion( + entry['description']) entry['media_type'] = u'image' # heh entry['uploader'] = request.user['_id'] -- cgit v1.2.3