aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/models.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-06-21 23:22:16 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-06-21 23:22:16 -0500
commit3208bea54cc8795ab4d8b35857fd40a55582358d (patch)
tree0427c2eba68865bb270d3b7161b218303ed6fb03 /mediagoblin/db/models.py
parent29f1333e722c10d3eff106bd64bb2ded0207e975 (diff)
parent0472653ee4763e2f045632d49a9eed729a491f97 (diff)
downloadmediagoblin-3208bea54cc8795ab4d8b35857fd40a55582358d.tar.lz
mediagoblin-3208bea54cc8795ab4d8b35857fd40a55582358d.tar.xz
mediagoblin-3208bea54cc8795ab4d8b35857fd40a55582358d.zip
Merge remote branch 'refs/remotes/gullydwarf-cfdv/is315'
Diffstat (limited to 'mediagoblin/db/models.py')
-rw-r--r--mediagoblin/db/models.py4
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):
"""