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

* 'master' of git://git.neuf.no/dusken:
  Removed Django User-model from admin interface and included its fields in Member-model

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)

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)