Merge branch 'za/bugfix-failing-migrations' into gd/1900-add-action-needed-reason

This commit is contained in:
zandercymatics 2024-06-07 09:49:34 -06:00
commit 2a9d33defe
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
12 changed files with 154 additions and 38 deletions

View file

@ -609,7 +609,7 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
None,
{"fields": ("username", "password", "status", "verification_type")},
),
("Personal Info", {"fields": ("first_name", "middle_name", "last_name", "email", "title")}),
("Personal Info", {"fields": ("first_name", "middle_name", "last_name", "title", "email", "phone")}),
(
"Permissions",
{
@ -640,7 +640,7 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
)
},
),
("Personal Info", {"fields": ("first_name", "middle_name", "last_name", "email", "title")}),
("Personal Info", {"fields": ("first_name", "middle_name", "last_name", "title", "email", "phone")}),
(
"Permissions",
{