Merge remote-tracking branch 'remotes/jwandborg/master'

2011-11-24 15:24:58 -06:00
parent 3018832153 6506b1e22c
commit 99d2ac1d83
29 changed files with 2974 additions and 236 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)