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/submit/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/submit/views.py')
| -rw-r--r-- | mediagoblin/submit/views.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index 1848f5e5..87e57dda 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -16,11 +16,13 @@ from os.path import splitext from cgi import FieldStorage +from string import split from werkzeug.utils import secure_filename from mediagoblin.util import ( - render_to_response, redirect, cleaned_markdown_conversion) + render_to_response, redirect, cleaned_markdown_conversion, \ + convert_to_tag_list_of_dicts) from mediagoblin.decorators import require_active_login from mediagoblin.submit import forms as submit_forms, security from mediagoblin.process_media import process_media_initial @@ -59,6 +61,10 @@ def submit_start(request): entry['media_type'] = u'image' # heh entry['uploader'] = request.user['_id'] + # Process the user's folksonomy "tags" + entry['tags'] = convert_to_tag_list_of_dicts( + request.POST.get('tags')) + # Save, just so we can get the entry id for the sake of using # it to generate the file path entry.save(validate=False) |