Merges working branch into master

This commit is contained in:
Mark Polak committed 2013-08-22 00:46:33 +02:00
commit de4effaadb
12 files changed
+168 -26

No files matched your search

+2 -5
View File
@@ -27,16 +27,13 @@ class MemberAdmin(admin.ModelAdmin):
return self.readonly_fields + ('username', )
return self.readonly_fields
class InstitutionAdmin(admin.ModelAdmin):
pass
admin.site.unregister(django.contrib.auth.models.Group)
admin.site.unregister(User)
admin.site.register(Address)
admin.site.register(Country)
admin.site.register(Group)
admin.site.register(Institution, InstitutionAdmin)
admin.site.register(Institution)
admin.site.register(Member, MemberAdmin)
admin.site.register(MembershipType)
admin.site.register(Membership)