From 892ed7cc6f894e8594092108f30e7270f3a94ec0 Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@gmail.com>
Date: Fri, 10 Apr 2026 10:35:34 +0300
Subject: [PATCH] Fix Group Membership breadcrumb and subnav title for Person
 Canvas

---
 app/resources/locales/en_US/menu.po           |  3 +++
 app/resources/locales/en_US/operation.po      |  3 ---
 app/src/Controller/GroupMembersController.php |  4 ++--
 app/templates/GroupMembers/columns.inc        | 10 ++++++++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po
index ab4c885a1..0280bea78 100644
--- a/app/resources/locales/en_US/menu.po
+++ b/app/resources/locales/en_US/menu.po
@@ -90,6 +90,9 @@ msgstr "All Features"
 msgid "co.groups"
 msgstr "Groups"
 
+msgid "co.groups.memberships"
+msgstr "Group Memberships"
+
 msgid "co.operations"
 msgstr "Operations"
 
diff --git a/app/resources/locales/en_US/operation.po b/app/resources/locales/en_US/operation.po
index 8d2d8c2d7..65230a4ac 100644
--- a/app/resources/locales/en_US/operation.po
+++ b/app/resources/locales/en_US/operation.po
@@ -404,6 +404,3 @@ msgstr "View Petition {0}"
 
 msgid "view.ExternalIdentityRoles.a"
 msgstr "View Role {0}"
-
-msgid "person.memberships"
-msgstr "My Memberships"
\ No newline at end of file
diff --git a/app/src/Controller/GroupMembersController.php b/app/src/Controller/GroupMembersController.php
index 4655beb4f..0cad43037 100644
--- a/app/src/Controller/GroupMembersController.php
+++ b/app/src/Controller/GroupMembersController.php
@@ -76,10 +76,10 @@ public function beforeRender(EventInterface $event) {
     
     // If we're in a Person context (index filtered by ?person_id=...), override the page title.
     if (
-      in_array($this->getRequest()->getParam('action'), ['index'], true)
+      $this->getRequest()->getParam('action') === 'index'
       && $this->getRequest()->getQuery('person_id') !== null
     ) {
-      $this->set('vv_title', __d('operation', 'person.memberships'));
+      $this->set('vv_title', __d('menu', 'co.groups.memberships'));
 
       // Ensure the breadcrumb leaf is plain text (no extra title-links).
       $this->set('vv_bc_title_links', []);
diff --git a/app/templates/GroupMembers/columns.inc b/app/templates/GroupMembers/columns.inc
index 6c40b226a..5dd5cdc2e 100644
--- a/app/templates/GroupMembers/columns.inc
+++ b/app/templates/GroupMembers/columns.inc
@@ -153,8 +153,14 @@ if ($this->request->getQuery('group_id') !== null) {
   ];
 
   $subnav = 'people';
-  $localTitle = __d('controller','Groups', 99);
-  
+  // If we're in a Person context (index filtered by ?person_id=...), do not override the subnav title.
+  if (
+    $this->getRequest()->getParam('action') === 'index'
+    && empty($this->getRequest()->getQuery('person_id'))
+  ) {
+    $localTitle = __d('controller','Groups', 99);
+  }
+
   // Do not show the normal add link here
   $suppressAddLink = true;
 ?>