diff options
Diffstat (limited to 'mediagoblin/db')
| -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 |
3 files changed, 3 insertions, 3 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) |