diff --git a/dusken/admin.py b/dusken/admin.py index 3d6e92f..28c672f 100644 --- a/dusken/admin.py +++ b/dusken/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin from django.contrib.auth.models import User -from dusken.models import Member, Institution, Address, Country +from dusken.models import * class MemberAdmin(admin.ModelAdmin): exclude = ( 'password', 'last_login', ) @@ -31,8 +31,13 @@ class MemberAdmin(admin.ModelAdmin): class InstitutionAdmin(admin.ModelAdmin): pass +admin.site.unregister(django.contrib.auth.models.Group) admin.site.unregister(User) -admin.site.register(Member, MemberAdmin) -admin.site.register(Institution, InstitutionAdmin) admin.site.register(Address) admin.site.register(Country) +admin.site.register(Group) +admin.site.register(Institution, InstitutionAdmin) +admin.site.register(Member, MemberAdmin) +admin.site.register(MembershipType) +admin.site.register(Membership) +admin.site.register(PlaceOfStudy) diff --git a/dusken/models.py b/dusken/models.py index 3b5509e..fe70a44 100644 --- a/dusken/models.py +++ b/dusken/models.py @@ -147,7 +147,7 @@ class Membership(models.Model): class Group(django.contrib.auth.models.Group): def __unicode__(self): - return u"{}".format(self.posix_name) + return u"{} ({})".format(self.name, self.posix_name) posix_name = models.CharField(max_length=255, unique=True) created = models.DateTimeField(auto_now_add=True) updated = models.DateTimeField(auto_now=True)