First crack at basic license support.

This commit is contained in:
Aaron Williamson
2012-01-17 00:33:55 -05:00
parent 98308e61b6
commit 25b48323a8
6 changed files with 30 additions and 3 deletions

View File

@@ -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(
@@ -33,7 +34,9 @@ class EditForm(wtforms.Form):
description=_(
"The title part of this media's URL. "
"You usually don't need to change this."))
license = wtforms.SelectField(
_('License'),
choices=licenses_as_choices())
class EditProfileForm(wtforms.Form):
bio = wtforms.TextAreaField(

View File

@@ -34,6 +34,7 @@ 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
@@ -45,7 +46,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,
@@ -71,6 +73,10 @@ 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()