diff options
author | Chris Moylan <chris@chrismoylan.com> | 2011-06-22 21:40:17 -0500 |
---|---|---|
committer | Chris Moylan <chris@chrismoylan.com> | 2011-06-22 21:40:17 -0500 |
commit | dcebe4b032453b31db93e0796c84de7dc8bdb005 (patch) | |
tree | 7608cd77fafd6ffb6179e8d7bd1c50bfcd9cdfb5 /mediagoblin/db/models.py | |
parent | 1975b5dd1fdae5ddb2819b8c67a29f9c374fce40 (diff) | |
parent | 54de443a6a6cd673cfef0efa73a9d5e6fc6cde7c (diff) | |
download | mediagoblin-dcebe4b032453b31db93e0796c84de7dc8bdb005.tar.lz mediagoblin-dcebe4b032453b31db93e0796c84de7dc8bdb005.tar.xz mediagoblin-dcebe4b032453b31db93e0796c84de7dc8bdb005.zip |
Merge branch 'master' into test_submission_views_365
Diffstat (limited to 'mediagoblin/db/models.py')
-rw-r--r-- | mediagoblin/db/models.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index e034cc29..600b79ff 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -46,6 +46,8 @@ class User(Document): 'status': unicode, 'verification_key': unicode, 'is_admin': bool, + 'url' : unicode, + 'bio' : unicode } required_fields = ['username', 'created', 'pw_hash', 'email'] @@ -56,6 +58,8 @@ class User(Document): 'status': u'needs_email_verification', 'verification_key': lambda: unicode(uuid.uuid4()), 'is_admin': False} + + migration_handler = migrations.UserMigration def check_login(self, password): """ |