From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 1 Jun 2011 00:17:28 +0000 (-0500)
Subject: Merge remote branch 'remotes/aleks/aleks'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d9951a6e03686e41479b83bc022eb97945efeca9;hp=b93a6a229e1c7a7eef76e8322104912378f79a96;p=mediagoblin.git

Merge remote branch 'remotes/aleks/aleks'
---

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 0e933fb7..0b85430a 100644
--- 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