From 46d6022aed77eb81a530d4cd05a257de6b9657e4 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Wed, 14 Feb 2024 15:29:10 -0700 Subject: [PATCH] Test removing concat --- src/registrar/admin.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 5c82a42f4..d4ff2e5dc 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -125,7 +125,7 @@ class CustomLogEntryAdmin(LogEntryAdmin): class AdminSortFields: - _name_sort = Concat("first_name", "last_name", "email") + _name_sort = ["first_name", "last_name", "email"] # Define a mapping of field names to model querysets and sort expressions sort_mapping = { # == Contact == # @@ -159,10 +159,13 @@ class AdminSortFields: match db_field.name: case "investigator": # 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 _: # If no case is defined, return the default - return model.objects.order_by(order_by) + if isinstance(order_by, list) or isinstance(order_by, tuple): + return model.objects.order_by(*order_by) + else: + return model.objects.order_by(order_by) class AuditedAdmin(admin.ModelAdmin):