From: John Gill Date: Mon, 2 Feb 2015 19:39:14 +0000 (-0400) Subject: Use settings.AUTH_USER_MODEL rather than auth.User. X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9416c05cd447e3aa40a2351684f2105dafa95e13;p=django_quiz.git Use settings.AUTH_USER_MODEL rather than auth.User. This is needed when using djang-allauth, since it replaces auth.User with its own class. --- diff --git a/quiz/models.py b/quiz/models.py index 64913d2..8a8c8de 100644 --- a/quiz/models.py +++ b/quiz/models.py @@ -8,6 +8,7 @@ from django.core.validators import MaxValueValidator from django.utils.translation import ugettext as _ from django.utils.timezone import now from django.utils.encoding import python_2_unicode_compatible +from django.conf import settings from model_utils.managers import InheritanceManager @@ -188,7 +189,7 @@ class Progress(models.Model): Data stored in csv using the format: category, score, possible, category, score, possible, ... """ - user = models.OneToOneField("auth.User", verbose_name=_("User")) + user = models.OneToOneField(settings.AUTH_USER_MODEL, verbose_name=_("User")) score = models.CommaSeparatedIntegerField(max_length=1024, verbose_name=_("Score")) @@ -361,7 +362,7 @@ class Sitting(models.Model): with the answer the user gave. """ - user = models.ForeignKey('auth.User', verbose_name=_("User")) + user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_("User")) quiz = models.ForeignKey(Quiz, verbose_name=_("Quiz"))