feature/aahq-44-django-groups-and-custom-user-tie-ups

src/users/admin.py

@@ -28,8 +28,8 @@ class TempleWebUserAdmin(UserAdmin):
     form = TempleWebAdminUserChangeForm
     add_form = TempleWebUserCreationForm
 
-    list_display = ["email", "is_superuser"]
-    list_filter = ["is_superuser"]
+    list_display = ["full_name", "email", "date_joined", "is_staff"]
+    list_filter = ["is_staff"]
 
     fieldsets = [
         (
@@ -38,21 +38,23 @@ class TempleWebUserAdmin(UserAdmin):
                 "fields": [
                     "email",
                     "password",
-                    "is_superuser",
                     "first_name",
                     "last_name",
-                    "is_staff",
                 ]
             },
-        )
+        ),
+        (
+            "Permissions",
+            {"fields": ["is_staff", "groups", "user_permissions"]},
+        ),
     ]
 
     add_fieldsets = [
         (
             None,
             {
                 "classes": ["wide"],
-                "fields": ["email", "password1", "password2", "is_superuser"],
+                "fields": ["email", "password1", "password2", "is_staff"],
             },
         )
     ]

src/users/forms.py

@@ -13,7 +13,7 @@ class TempleWebUserCreationForm(forms.ModelForm):
 
     class Meta:
         model = TempleWebUser
-        fields = ["email"]
+        fields = ["email", "is_staff", "first_name", "last_name"]
 
     def clean_password2(self):
         # Check that the two password entries match

src/users/models.py

@@ -17,6 +17,9 @@ class TempleWebUser(AbstractUser):
     def __str__(self):
         return self.email
 
+    def full_name(self):
+        return self.get_full_name()
+
 
 class UserProfile(models.Model):
     user = models.OneToOneField(TempleWebUser, on_delete=models.CASCADE)