Merge branch 'video_gstreamer-only'

Conflicts: mediagoblin/db/migrations.py mediagoblin/submit/views.py
2011-11-21 21:51:30 +01:00
parent e56e5f8c5c c875bb74a8
commit b9e1fa280e
25 changed files with 2993 additions and 32 deletions
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -100,3 +100,11 @@ def user_add_forgot_password_token_and_expires(database):
    """
    add_table_field(database, 'users', 'fp_verification_key', None)
    add_table_field(database, 'users', 'fp_token_expire', None)
+
+
+@RegisterMigration(7)
+def media_type_image_to_multimedia_type_image(database):
+    database['media_entries'].update(
+        {'media_type': 'image'},
+        {'$set': {'media_type': 'mediagoblin.media_types.image'}},
+        multi=True)