From 367012af3670feea9536d8be9ec1766d03fc32fd Mon Sep 17 00:00:00 2001
From: Sami Mokaddem <mokaddem.sami@gmail.com>
Date: Thu, 7 Sep 2023 16:43:30 +0200
Subject: [PATCH] fix: [individual:edit] Select individuals based on their id
 and not their user_id

---
 src/Model/Table/IndividualsTable.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Model/Table/IndividualsTable.php b/src/Model/Table/IndividualsTable.php
index 277b2f7..aa13727 100644
--- a/src/Model/Table/IndividualsTable.php
+++ b/src/Model/Table/IndividualsTable.php
@@ -125,7 +125,7 @@ class IndividualsTable extends AppTable
     public function getValidIndividualsToEdit(object $currentUser): array
     {
         $validRoles = $this->Users->Roles->find('list')->select(['id'])->where(['perm_admin' => 0, 'perm_org_admin' => 0])->all()->toArray();
-        $validIndividualIds = $this->Users->find('list')->select(['individual_id'])->where(
+        $validIndividualIds = $this->Users->find()->select(['individual_id'])->where(
             [
                 'organisation_id' => $currentUser['organisation_id'],
                 'disabled' => 0,
@@ -134,7 +134,7 @@ class IndividualsTable extends AppTable
                     ['id' => $currentUser['id']],
                 ]
             ]
-        )->all()->toArray();
-        return array_keys($validIndividualIds);
+        )->all()->extract('individual_id')->toArray();
+        return $validIndividualIds;
     }
 }