Merge remote branch 'remotes/aleks/aleks'

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 0e933fb777c4cc631943f5f259bbeb66ea10787e..0b85430adfaa95e13bb32dd98232f943bd2b4cb8 100644 (file)
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -103,7 +103,7 @@ class MediaEntry(Document):
         'thumbnail_file': [unicode]}
 
     required_fields = [
-        'uploader', 'created', 'media_type']
+        'uploader', 'created', 'media_type', 'slug']
 
     default_values = {
         'created': datetime.datetime.utcnow,
@@ -111,11 +111,10 @@ class MediaEntry(Document):
 
     migration_handler = migrations.MediaEntryMigration
 
-    # Actually we should referene uniqueness by uploader, but we
-    # should fix http://bugs.foocorp.net/issues/340 first.
-    # indexes = [
-    #     {'fields': ['uploader', 'slug'],
-    #      'unique': True}]
+    indexes = [
+        # Referene uniqueness of slugs by uploader
+        {'fields': ['uploader', 'slug'],
+         'unique': True}]
 
     def main_mediafile(self):
         pass