edb/dusken-old
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.neuf.no:dusken

Browse Source
This commit is contained in:
nikolark committed 2013-12-27 22:55:59 +01:00
2 parents 9bc68f15df f1835df34b
commit 3128fdfc06
1 file changed
+1 -3
Download Patch File Download Diff File Expand all files Collapse all files
dusken/models.py
+1 -3
View File
@@ -11,7 +11,7 @@ class AbstractBaseModel(models.Model):
class Meta: class Meta:
abstract = True abstract = True
class Member(django.contrib.auth.models.AbstractUser): class Member(django.contrib.auth.models.AbstractUser, AbstractBaseModel):
def __unicode__(self): def __unicode__(self):
if len(self.first_name) + len(self.last_name) > 0: if len(self.first_name) + len(self.last_name) > 0:
return u'{first} {last} ({username})'.format( return u'{first} {last} ({username})'.format(
@@ -25,8 +25,6 @@ class Member(django.contrib.auth.models.AbstractUser):
legacy_id = models.IntegerField(null=True, blank=True) legacy_id = models.IntegerField(null=True, blank=True)
address = models.OneToOneField('dusken.Address', null=True, blank=True) address = models.OneToOneField('dusken.Address', null=True, blank=True)
place_of_study = models.ManyToManyField('dusken.PlaceOfStudy', null=True, blank=True) place_of_study = models.ManyToManyField('dusken.PlaceOfStudy', null=True, blank=True)
created = models.DateTimeField(auto_now_add=True)
updated = models.DateTimeField(auto_now=True)
def owner(self): def owner(self):
return self return self