From 6cbe731f724d4804f308cb57d82f741c69c48c4b Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Wed, 22 Jul 2026 17:06:10 -0400
Subject: [PATCH] Fix Group Member index sort by Primary Name (CFM-363)

---
 app/src/Controller/GroupMembersController.php | 3 ++-
 app/src/Controller/StandardController.php     | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/Controller/GroupMembersController.php b/app/src/Controller/GroupMembersController.php
index 0cad43037..dfa439830 100644
--- a/app/src/Controller/GroupMembersController.php
+++ b/app/src/Controller/GroupMembersController.php
@@ -38,7 +38,7 @@
 class GroupMembersController extends StandardController {
   protected array $paginate = [
     'order' => [
-      'People.primary_name.name' => 'asc'
+      'PrimaryName.family' => 'asc'
     ]
   ];
 
@@ -125,4 +125,5 @@ public function deleted() {
     
     return parent::deleted();
   }
+  
 }
\ No newline at end of file
diff --git a/app/src/Controller/StandardController.php b/app/src/Controller/StandardController.php
index 9e56cad65..d4fe9d12d 100644
--- a/app/src/Controller/StandardController.php
+++ b/app/src/Controller/StandardController.php
@@ -712,6 +712,11 @@ public function index() {
       $query = $query->where(['enrollee_person_id' => $this->request->getQuery('enrollee_person_id')]);
     }
 
+    // Force a default order if set
+    if (empty($this->request->getQuery('sort')) && !empty($this->paginate['order'])) {
+      $query = $query->order($this->paginate['order']);
+    }
+
     // Fetch the data and paginate
     $paginationLimit = $this->getValue(ApplicationStateEnum::PaginationLimit, DEF_SEARCH_LIMIT);
     $resultSet = $this->paginate($query, [