aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJef van Schendel <jefvanschendel@gmail.com>2011-05-31 14:32:46 +0200
committerJef van Schendel <jefvanschendel@gmail.com>2011-05-31 14:32:46 +0200
commit54f9d72356e2c3ed1a3afa2cdced1704534f594c (patch)
tree50ecf5f4acdc96abf3e4e3535564c49f0603b2b7
parent0d5094cb3b417892a402d52be76297979762d30f (diff)
parentb1ae76aea0141354b479e1c0451bc003e9b6e248 (diff)
downloadmediagoblin-54f9d72356e2c3ed1a3afa2cdced1704534f594c.tar.lz
mediagoblin-54f9d72356e2c3ed1a3afa2cdced1704534f594c.tar.xz
mediagoblin-54f9d72356e2c3ed1a3afa2cdced1704534f594c.zip
Merge remote-tracking branch 'gitorious/master'
-rw-r--r--mediagoblin/db/models.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 37420834..3da97a49 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -95,7 +95,7 @@ class MediaEntry(Document):
'thumbnail_file': [unicode]}
required_fields = [
- 'uploader', 'created', 'media_type']
+ 'uploader', 'created', 'media_type', 'slug']
default_values = {
'created': datetime.datetime.utcnow,
@@ -103,11 +103,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