diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-01-21 16:40:39 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-01-21 16:40:39 -0600 |
| commit | 2788e6a16484330ce1091ae57a87a4da362936c6 (patch) | |
| tree | 49bdc0fe23a791ff9c9a3571dcec3009e337e96e | |
| parent | 3c351460e1dbed9e789e363f1d5635160bce8d84 (diff) | |
| download | mediagoblin-2788e6a16484330ce1091ae57a87a4da362936c6.tar.lz mediagoblin-2788e6a16484330ce1091ae57a87a4da362936c6.tar.xz mediagoblin-2788e6a16484330ce1091ae57a87a4da362936c6.zip | |
License "all rights reserved" default should be None/NULL, not empty string
| -rw-r--r-- | mediagoblin/db/mixin.py | 2 | ||||
| -rw-r--r-- | mediagoblin/db/mongo/migrations.py | 2 | ||||
| -rw-r--r-- | mediagoblin/db/sql/models.py | 2 | ||||
| -rw-r--r-- | mediagoblin/edit/views.py | 2 | ||||
| -rw-r--r-- | mediagoblin/submit/views.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index b0fecad3..d587ccb4 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -93,4 +93,4 @@ class MediaEntryMixin(object): def get_license_data(self): """Return license dict for requested license""" - return licenses.SUPPORTED_LICENSES[self.license] + return licenses.SUPPORTED_LICENSES[self.license or ""] diff --git a/mediagoblin/db/mongo/migrations.py b/mediagoblin/db/mongo/migrations.py index f66ade2b..168fa530 100644 --- a/mediagoblin/db/mongo/migrations.py +++ b/mediagoblin/db/mongo/migrations.py @@ -114,4 +114,4 @@ def mediaentry_add_license(database): """ 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) diff --git a/mediagoblin/db/sql/models.py b/mediagoblin/db/sql/models.py index 53ac3d3f..507efe62 100644 --- a/mediagoblin/db/sql/models.py +++ b/mediagoblin/db/sql/models.py @@ -81,7 +81,7 @@ class MediaEntry(Base, MediaEntryMixin): description_html = Column(UnicodeText) # ?? media_type = Column(Unicode, nullable=False) state = Column(Unicode, nullable=False) # or use sqlalchemy.types.Enum? - license = Column(Unicode, nullable=False) + license = Column(Unicode) fail_error = Column(Unicode) fail_metadata = Column(UnicodeText) diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index 62684dcf..471968f7 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -75,7 +75,7 @@ def edit_media(request, media): media.description_html = cleaned_markdown_conversion( media.description) - media.license = unicode(request.POST.get('license', '')) + media.license = unicode(request.POST.get('license')) or None media.slug = unicode(request.POST['slug']) diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index 832203a4..f70e4ba5 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -69,7 +69,7 @@ def submit_start(request): entry.description_html = cleaned_markdown_conversion( entry.description) - entry.license = unicode(request.POST.get('license', '')) + entry.license = unicode(request.POST.get('license', "")) or None entry.uploader = request.user._id |