zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-25 03:58:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add ordering

Browse source
This commit is contained in:
zandercymatics 2024-02-14 14:37:06 -07:00
parent 9cb0f7ec62
commit 397e71463e
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/registrar/admin.py
View file

@ -160,9 +160,6 @@ class AdminSortFields:
case "investigator": case "investigator":
# We should only return users who are staff # We should only return users who are staff
return model.objects.filter(is_staff=True).order_by(order_by) return model.objects.filter(is_staff=True).order_by(order_by)
case "submitter":
db_field_model = db_field.model
db_field_model.objects.select_related("submitter")
case _: case _:
# If no case is defined, return the default # If no case is defined, return the default
return model.objects.order_by(order_by) return model.objects.order_by(order_by)
@ -275,7 +272,7 @@ class UserContactInline(admin.StackedInline):
model = models.Contact model = models.Contact
class MyUserAdmin(BaseUserAdmin): class UserAdmin(BaseUserAdmin):
"""Custom user admin class to use our inlines.""" """Custom user admin class to use our inlines."""
inlines = [UserContactInline] inlines = [UserContactInline]
@ -430,6 +427,9 @@ class ContactAdmin(ListHeaderAdmin):
"contact", "contact",
"email", "email",
] ]
# this ordering effects the ordering of results
# in autocomplete_fields for user
ordering = ["first_name", "last_name", "email"]
# We name the custom prop 'contact' because linter # We name the custom prop 'contact' because linter
# is not allowing a short_description attr on it # is not allowing a short_description attr on it
@ -1342,6 +1342,10 @@ class DraftDomainAdmin(ListHeaderAdmin):
search_fields = ["name"] search_fields = ["name"]
search_help_text = "Search by draft domain name." search_help_text = "Search by draft domain name."
# this ordering effects the ordering of results
# in autocomplete_fields for user
ordering = ["name"]
class VerifiedByStaffAdmin(ListHeaderAdmin): class VerifiedByStaffAdmin(ListHeaderAdmin):
list_display = ("email", "requestor", "truncated_notes", "created_at") list_display = ("email", "requestor", "truncated_notes", "created_at")
@ -1368,7 +1372,7 @@ class VerifiedByStaffAdmin(ListHeaderAdmin):
admin.site.unregister(LogEntry) # Unregister the default registration admin.site.unregister(LogEntry) # Unregister the default registration
admin.site.register(LogEntry, CustomLogEntryAdmin) admin.site.register(LogEntry, CustomLogEntryAdmin)
admin.site.register(models.User, MyUserAdmin) admin.site.register(models.User, UserAdmin)
# Unregister the built-in Group model # Unregister the built-in Group model
admin.site.unregister(Group) admin.site.unregister(Group)
# Register UserGroup # Register UserGroup

4
src/registrar/assets/sass/_theme/_admin.scss
View file

@ -271,6 +271,10 @@ h1, h2, h3,
} }
} }
.select2-selection__clear {
display: none;
}
.select2-dropdown { .select2-dropdown {
display: inline-grid !important; display: inline-grid !important;
} }