diff options
Diffstat (limited to 'mediagoblin/edit')
| -rw-r--r-- | mediagoblin/edit/forms.py | 5 | ||||
| -rw-r--r-- | mediagoblin/edit/views.py | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py index 5c191fba..d49b9b28 100644 --- a/mediagoblin/edit/forms.py +++ b/mediagoblin/edit/forms.py @@ -18,6 +18,7 @@ import wtforms from mediagoblin.tools.text import tag_length_validator, TOO_LONG_TAG_WARNING from mediagoblin.tools.translate import fake_ugettext_passthrough as _ +from mediagoblin.tools.licenses import licenses_as_choices class EditForm(wtforms.Form): title = wtforms.TextField( @@ -39,7 +40,9 @@ class EditForm(wtforms.Form): description=_( "The title part of this media's address. " "You usually don't need to change this.")) - + license = wtforms.SelectField( + _('License'), + choices=licenses_as_choices()) class EditProfileForm(wtforms.Form): bio = wtforms.TextAreaField( diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index ec748028..cffb8a3c 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -35,6 +35,8 @@ from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.text import ( clean_html, convert_to_tag_list_of_dicts, media_tags_as_string, cleaned_markdown_conversion) +from mediagoblin.tools.licenses import SUPPORTED_LICENSES + @get_user_media_entry @require_active_login @@ -46,7 +48,8 @@ def edit_media(request, media): title=media.title, slug=media.slug, description=media.description, - tags=media_tags_as_string(media.tags)) + tags=media_tags_as_string(media.tags), + license=media.license) form = forms.EditForm( request.POST, @@ -72,7 +75,12 @@ def edit_media(request, media): media.description_html = cleaned_markdown_conversion( media.description) + media.license = ( + unicode(request.POST.get('license')) + or '') + media.slug = unicode(request.POST['slug']) + media.save() return exc.HTTPFound( |