heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

License "all rights reserved" default should be None/NULL, not empty string

Browse Source
This commit is contained in:
Christopher Allan Webber 2012-01-21 16:40:39 -06:00
parent 3c351460e1
commit 2788e6a164
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/db/mixin.py
View File

@ -93,4 +93,4 @@ class MediaEntryMixin(object):
def get_license_data(self): def get_license_data(self):
"""Return license dict for requested license""" """Return license dict for requested license"""
return licenses.SUPPORTED_LICENSES[self.license] return licenses.SUPPORTED_LICENSES[self.license or ""]

2
mediagoblin/db/mongo/migrations.py
View File

@ -114,4 +114,4 @@ def mediaentry_add_license(database):
""" """
Add the 'license' field for entries that don't have it. Add the 'license' field for entries that don't have it.
""" """
add_table_field(database, 'media_entries', 'license', '') add_table_field(database, 'media_entries', 'license', None)

2
mediagoblin/db/sql/models.py
View File

@ -81,7 +81,7 @@ class MediaEntry(Base, MediaEntryMixin):
description_html = Column(UnicodeText) # ?? description_html = Column(UnicodeText) # ??
media_type = Column(Unicode, nullable=False) media_type = Column(Unicode, nullable=False)
state = Column(Unicode, nullable=False) # or use sqlalchemy.types.Enum? state = Column(Unicode, nullable=False) # or use sqlalchemy.types.Enum?
license = Column(Unicode, nullable=False) license = Column(Unicode)
fail_error = Column(Unicode) fail_error = Column(Unicode)
fail_metadata = Column(UnicodeText) fail_metadata = Column(UnicodeText)

2
mediagoblin/edit/views.py
View File

@ -75,7 +75,7 @@ def edit_media(request, media):
media.description_html = cleaned_markdown_conversion( media.description_html = cleaned_markdown_conversion(
media.description) media.description)
media.license = unicode(request.POST.get('license', '')) media.license = unicode(request.POST.get('license')) or None
media.slug = unicode(request.POST['slug']) media.slug = unicode(request.POST['slug'])

2
mediagoblin/submit/views.py
View File

@ -69,7 +69,7 @@ def submit_start(request):
entry.description_html = cleaned_markdown_conversion( entry.description_html = cleaned_markdown_conversion(
entry.description) entry.description)
entry.license = unicode(request.POST.get('license', '')) entry.license = unicode(request.POST.get('license', "")) or None
entry.uploader = request.user._id entry.uploader = request.user._id