Swap AbstractBaseUser to AbstractUser

users/admin.py

@@ -4,10 +4,9 @@
 
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-from django.contrib.auth.models import Group
+from django.utils.translation import ugettext_lazy as _
 from reversion.admin import VersionAdmin
 
-from .forms import UserChangeForm, UserCreationForm
 from .models import User, Right, Adhesion, ListRight, Clef, Request
 
 
@@ -32,31 +31,16 @@ class ListRightAdmin(VersionAdmin):
 
 
 class UserAdmin(VersionAdmin, BaseUserAdmin):
-    # The forms to add and change user instances
-    form = UserChangeForm
-    add_form = UserCreationForm
-
-    # The fields to be used in displaying the User model.
-    # These override the definitions on the base UserAdmin
-    # that reference specific fields on auth.User.
-    list_display = ('username', 'name', 'last_name', 'email', 'is_admin')
-    list_filter = ()
+    # Customize admin to add more fields
     fieldsets = (
         (None, {'fields': ('username', 'password')}),
-        ('Personal info', {'fields': ('name', 'last_name', 'email')}),
-        ('Permissions', {'fields': ('is_admin',)}),
+        (_('Personal info'), {'fields': ('first_name', 'last_name', 'email',
+                                         'telephone', 'address', 'comment')}),
+        (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
+                                       'groups', 'user_permissions',
+                                       'maxemprunt')}),
+        (_('Important dates'), {'fields': ('last_login', 'date_joined')}),
     )
-    # add_fieldsets is not a standard ModelAdmin attribute. UserAdmin
-    # overrides get_fieldsets to use this attribute when creating a user.
-    add_fieldsets = (
-        (None, {
-            'classes': ('wide',),
-            'fields': ('username', 'name', 'last_name', 'email', 'is_admin', 'password1', 'password2')}
-         ),
-    )
-    search_fields = ('username',)
-    ordering = ('username',)
-    filter_horizontal = ()
 
 
 admin.site.register(User, UserAdmin)
@@ -65,9 +49,3 @@ admin.site.register(ListRight, ListRightAdmin)
 admin.site.register(Right, RightAdmin)
 admin.site.register(Adhesion, AdhesionAdmin)
 admin.site.register(Clef, ClefAdmin)
-# Now register the new UserAdmin...
-admin.site.unregister(User)
-admin.site.register(User, UserAdmin)
-# ... and, since we're not using Django's built-in permissions,
-# unregister the Group model from admin.
-admin.site.unregister(Group)