summaryrefslogtreecommitdiffstats
path: root/django_authopenid/models.py
diff options
context:
space:
mode:
authorAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2010-02-09 15:06:29 -0600
committerAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2010-02-09 15:06:29 -0600
commitd276802efa5899ccb568de1b4c445d54ea72c42d (patch)
tree8026f29a4b6bd794d1e8cb9a34aaa7ea29cea225 /django_authopenid/models.py
parent8de2b9131ddcef647799cf8e1e79921284523073 (diff)
parent81e2244eca04c02de0d7c32f0063f64f2ca3b1c4 (diff)
downloadaskbot-d276802efa5899ccb568de1b4c445d54ea72c42d.tar.gz
askbot-d276802efa5899ccb568de1b4c445d54ea72c42d.tar.bz2
askbot-d276802efa5899ccb568de1b4c445d54ea72c42d.zip
Merge branch 'evgenyfadeev/master'
Conflicts: django_authopenid/util.py forum/feed.py forum/views.py settings.py settings_local.py.dist templates/about.html templates/content/style/style.css templates/question.html templates/questions.html
Diffstat (limited to 'django_authopenid/models.py')
-rw-r--r--django_authopenid/models.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/django_authopenid/models.py b/django_authopenid/models.py
index 7b2e1c02..a12c2fec 100644
--- a/django_authopenid/models.py
+++ b/django_authopenid/models.py
@@ -71,6 +71,10 @@ class UserPasswordQueue(models.Model):
return self.user.username
class ExternalLoginData(models.Model):
+ """this class was added by Evgeny to associate
+ external authentication user with django user
+ probably it just does not belong here... (EF)
+ """
external_username = models.CharField(max_length=40, unique=True, null=False)
external_session_data = models.TextField()
user = models.ForeignKey(User, null=True)