aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db
diff options
context:
space:
mode:
authorJoar Wandborg <git@wandborg.com>2011-11-21 21:51:30 +0100
committerJoar Wandborg <git@wandborg.com>2011-11-21 21:51:30 +0100
commitb9e1fa280edfff4daf424bbcf51bd651ed00f411 (patch)
tree9f373c6443874bc5542115a79860da5957a1e182 /mediagoblin/db
parente56e5f8c5c3dc7909aa68a1543ed04ddb18e27f6 (diff)
parentc875bb74a8245b39b6985f37cb8ab838c22efa7e (diff)
downloadmediagoblin-b9e1fa280edfff4daf424bbcf51bd651ed00f411.tar.lz
mediagoblin-b9e1fa280edfff4daf424bbcf51bd651ed00f411.tar.xz
mediagoblin-b9e1fa280edfff4daf424bbcf51bd651ed00f411.zip
Merge branch 'video_gstreamer-only'
Conflicts: mediagoblin/db/migrations.py mediagoblin/submit/views.py
Diffstat (limited to 'mediagoblin/db')
-rw-r--r--mediagoblin/db/migrations.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index edaf5630..cfc01287 100644
--- 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)