diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-30 13:09:01 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-30 13:09:01 -0500 |
commit | 3cdf366acfb577e735abc7fee6c8395fa97c8b48 (patch) | |
tree | 7a7287235d3597cebc0272532971726e10110e47 /mediagoblin/edit/views.py | |
parent | 482d53cd30229798ff58f9d6f3cbb3b86f94f218 (diff) | |
parent | f99b5caeb68cb60d768f0e049388a6f4a8b68ac0 (diff) | |
download | mediagoblin-3cdf366acfb577e735abc7fee6c8395fa97c8b48.tar.lz mediagoblin-3cdf366acfb577e735abc7fee6c8395fa97c8b48.tar.xz mediagoblin-3cdf366acfb577e735abc7fee6c8395fa97c8b48.zip |
Merge branch 'remotes/gullydwarf-cfdv/f360_tagging' (early part) into mergetags
Conflicts:
mediagoblin/config_spec.ini
mediagoblin/edit/views.py
mediagoblin/util.py
Diffstat (limited to 'mediagoblin/edit/views.py')
-rw-r--r-- | mediagoblin/edit/views.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index f372fbb9..5cbaadb5 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -16,10 +16,13 @@ from webob import exc +from string import split from mediagoblin import messages +from mediagoblin import mg_globals from mediagoblin.util import ( - render_to_response, redirect, cleaned_markdown_conversion) + render_to_response, redirect, clean_html, convert_to_tag_list_of_dicts, + media_tags_as_string, cleaned_markdown_conversion) from mediagoblin.edit import forms from mediagoblin.edit.lib import may_edit_media from mediagoblin.decorators import require_active_login, get_user_media_entry @@ -34,7 +37,8 @@ def edit_media(request, media): form = forms.EditForm(request.POST, title = media['title'], slug = media['slug'], - description = media['description']) + description = media['description'], + tags = media_tags_as_string(media['tags'])) if request.method == 'POST' and form.validate(): # Make sure there isn't already a MediaEntry with such a slug @@ -50,7 +54,9 @@ def edit_media(request, media): else: media['title'] = request.POST['title'] media['description'] = request.POST.get('description') - + media['tags'] = convert_to_tag_list_of_dicts( + request.POST.get('tags')) + media['description_html'] = cleaned_markdown_conversion( media['description']) |