From 5b8aaae7a8b0bf23f212266d6ae233e9b8585120 Mon Sep 17 00:00:00 2001 From: Robert Kolner Date: Wed, 21 Aug 2013 20:18:13 +0200 Subject: [PATCH] Removed Django User-model from admin interface and included its fields in Member-model --- dusken/admin.py | 13 ++++++++++--- dusken/models.py | 4 +++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dusken/admin.py b/dusken/admin.py index 9e0e799..81defcd 100644 --- a/dusken/admin.py +++ b/dusken/admin.py @@ -1,15 +1,22 @@ from django.contrib import admin +from django.contrib.auth.models import User from dusken.models import Member, Institution class MemberAdmin(admin.ModelAdmin): fieldsets = [ - ('Other User instances', {'fields' : ['legacy_id']}), - #('User data', {'fields' : ['username', 'email', 'first_name', 'last_name']}), - ('User data', {'fields' : ['phone_number', 'date_of_birth', 'address', 'place_of_study']}), + ('Other User instances', + {'fields' : ['legacy_id']}), + ('User data', + {'fields' : ['username', 'email', 'first_name', 'last_name']}), + ('User data', + {'fields' : ['phone_number', 'date_of_birth', 'address', 'place_of_study']}), ] + readonly_fields = ( 'username', ) + class InstitutionAdmin(admin.ModelAdmin): pass +admin.site.unregister(User) admin.site.register(Member, MemberAdmin) admin.site.register(Institution, InstitutionAdmin) diff --git a/dusken/models.py b/dusken/models.py index 2df299c..21b6fb9 100644 --- a/dusken/models.py +++ b/dusken/models.py @@ -34,7 +34,9 @@ class PlaceOfStudy(models.Model): class Member(django.contrib.auth.models.User): def __unicode__(self): - return u'%s %s' % (self.first_name, self.last_name) + if len(self.first_name) + len(self.last_name) > 0: + return u'%s %s (%s)' % (self.first_name, self.last_name, self.username) + return u"%s" % (self.username) phone_number = models.IntegerField(unique=True, null=True, blank=True) date_of_birth = models.DateField(blank=True, null=True)