Merge branch 'master' into jb3/features/user-join-sorting

Allow sorting and filtering by Profile.date_joined in Django admin
2026-01-23 16:32:15 +00:00 · 2024-11-01 23:52:48 +00:00 · 2024-10-31 17:09:13 +00:00
1 changed files with 2 additions and 2 deletions
--- a/RIGS/admin.py
+++ b/RIGS/admin.py
@@ -154,9 +154,9 @@ class AssociateAdmin(VersionAdmin):

@admin.register(models.Profile)
 class ProfileAdmin(UserAdmin, AssociateAdmin):
-    list_display = ('username', 'name', 'is_approved', 'is_superuser', 'is_supervisor', 'number_of_events', 'last_login')
+    list_display = ('username', 'name', 'is_approved', 'is_superuser', 'is_supervisor', 'number_of_events', 'last_login', 'date_joined')
    list_display_links = ['username']
-    list_filter = UserAdmin.list_filter + ('is_approved',)
+    list_filter = UserAdmin.list_filter + ('is_approved', 'date_joined')
    fieldsets = (
        (None, {'fields': ('username', 'password')}),
        (_('Personal info'), {
Author	SHA1	Message	Date
Joe Banks	3cfea8eb93	Merge branch 'master' into jb3/features/user-join-sorting	2024-11-01 23:52:48 +00:00
Joe Banks	6747567bc1	Allow sorting and filtering by Profile.date_joined in Django admin	2024-10-31 17:09:13 +00:00