aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/migrations.py
diff options
context:
space:
mode:
authorNathan Yergler <nathan@yergler.net>2011-10-01 12:08:58 -0700
committerNathan Yergler <nathan@yergler.net>2011-10-01 12:08:58 -0700
commit6bfbe0242653678c09258b7a642514d706153eac (patch)
treed3e0c7f94f566886a6b80ce98d8a003465f4368f /mediagoblin/db/migrations.py
parent0a8a3fc1571100aba3bd3a3dec98f5e9e252780b (diff)
parent573aba86b58c2ab064d0d57ed0bbae6bdf9a2819 (diff)
downloadmediagoblin-6bfbe0242653678c09258b7a642514d706153eac.tar.lz
mediagoblin-6bfbe0242653678c09258b7a642514d706153eac.tar.xz
mediagoblin-6bfbe0242653678c09258b7a642514d706153eac.zip
Merge remote-tracking branch 'refs/remotes/upstream/master' into 569-application-middleware
Conflicts: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
Diffstat (limited to 'mediagoblin/db/migrations.py')
-rw-r--r--mediagoblin/db/migrations.py15
1 files changed, 15 insertions, 0 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index b07681a6..755f49c5 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -92,3 +92,18 @@ def mediaentry_add_fail_error_and_metadata(database):
{'fail_metadata': {'$exists': False}},
{'$set': {'fail_metadata': {}}},
multi=True)
+
+
+@RegisterMigration(6)
+def user_add_forgot_password_token_and_expires(database):
+ """
+ Add token and expiration fields to help recover forgotten passwords
+ """
+ database['users'].update(
+ {'fp_verification_key': {'$exists': False}},
+ {'$set': {'fp_verification_key': None}},
+ multi=True)
+ database['users'].update(
+ {'fp_token_expire': {'$exists': False}},
+ {'$set': {'fp_token_expire': None}},
+ multi=True)