Merge remote-tracking branch 'gitorious/master'

This commit is contained in:
Jef van Schendel 2011-05-31 14:32:46 +02:00
commit 54f9d72356

View File

@ -95,7 +95,7 @@ class MediaEntry(Document):
'thumbnail_file': [unicode]} 'thumbnail_file': [unicode]}
required_fields = [ required_fields = [
'uploader', 'created', 'media_type'] 'uploader', 'created', 'media_type', 'slug']
default_values = { default_values = {
'created': datetime.datetime.utcnow, 'created': datetime.datetime.utcnow,
@ -103,11 +103,10 @@ class MediaEntry(Document):
migration_handler = migrations.MediaEntryMigration migration_handler = migrations.MediaEntryMigration
# Actually we should referene uniqueness by uploader, but we indexes = [
# should fix http://bugs.foocorp.net/issues/340 first. # Referene uniqueness of slugs by uploader
# indexes = [ {'fields': ['uploader', 'slug'],
# {'fields': ['uploader', 'slug'], 'unique': True}]
# 'unique': True}]
def main_mediafile(self): def main_mediafile(self):
pass pass