#P07/#S07. As Participant/Staff, I would like to view all teams' information (#130)

Author: stefdworschak

accounts/admin.py

@@ -1,26 +1,28 @@
 from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
 from django.contrib.auth.forms import AdminPasswordChangeForm, \
     UserChangeForm, UserCreationForm
 from django.contrib.auth.decorators import login_required
 
 from .models import CustomUser, Organisation
 
 
-class CustomUserAdmin(admin.ModelAdmin):
+class CustomUserAdmin(BaseUserAdmin):
     fieldsets = (
         (None, {'fields': ('email', 'password')}),
         ('Personal info', {'fields': (
-            'first_name', 'last_name', 'slack_display_name', 'user_type',
+            'full_name', 'slack_display_name', 'user_type',
             'current_lms_module', 'organisation')}),
         ('Permissions', {'fields': (
-            'is_active', 'is_staff', 'is_superuser', 'groups',
-            'user_permissions')}),
+            'is_active', 'is_staff', 'is_superuser', 
+            'profile_is_public', 'email_is_public',
+            'groups', 'user_permissions')}),
         ('Important dates', {'fields': ('last_login', 'date_joined')}),
     )
 
     limited_fieldsets = (
         (None, {'fields': ('email',)}),
-        ('Personal info', {'fields': ('first_name', 'last_name',
+        ('Personal info', {'fields': ('full_name',
                                       'slack_display_name', 'user_type',
                                       'organisation')}),
         ('Important dates', {'fields': ('last_login', 'date_joined')}),
@@ -35,10 +37,9 @@ class CustomUserAdmin(admin.ModelAdmin):
 
     form = UserChangeForm
     add_form = UserCreationForm
-    change_password_form = AdminPasswordChangeForm
-    list_display = ('email', 'first_name', 'last_name', 'is_superuser')
+    list_display = ('email', 'full_name', 'is_superuser')
     list_filter = ('is_staff', 'is_superuser', 'is_active', 'groups')
-    search_fields = ('first_name', 'last_name', 'email')
+    search_fields = ('full_name', 'email')
     ordering = ('email',)
     readonly_fields = ('last_login', 'date_joined',)