Integrated Member with User class builtin in Django. Breaks tests due to old fixture-file.

This commit is contained in:
Robert Kolner committed 2013-02-21 12:31:44 +01:00
1 parent e661d8b16c
commit d7e19545c0
2 files changed
+8 -5

No files matched your search

+3
View File
@@ -121,6 +121,9 @@ INSTALLED_APPS = (
'tastypie'
)
# Profile of the User class used for authentication.
AUTH_PROFILE_MODEL = 'main.models.Member'
# A sample logging configuration. The only tangible logging
# performed by this configuration is to send an email to
# the site admins on every HTTP 500 error when DEBUG=False.
+5 -5
View File
@@ -1,3 +1,4 @@
from django.contrib.auth.models import User
from django.db import models
class Country(models.Model):
@@ -25,12 +26,11 @@ class PlaceOfStudy(models.Model):
updated = models.DateTimeField(auto_now=True)
class Member(models.Model):
email = models.CharField(max_length=150, unique=True)
password = models.CharField(max_length=255)
username = models.CharField(max_length=40, unique=True, null=True, blank=True)
# Auth:
user = models.OneToOneField(User)
# Profile fields:
phone_number = models.IntegerField(unique=True, null=True, blank=True)
first_name = models.CharField(max_length=200, blank=True, null=True)
last_name= models.CharField(max_length=200, blank=True, null=True)
date_of_birth = models.DateField(blank=True, null=True)
legacy_id = models.IntegerField(unique=True, null=True, blank=True)
address = models.ForeignKey(Address, null=True, blank=True)