From 21d03ee585744631faac202e771aeaf46ed97ade Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Thu, 22 Aug 2024 12:26:24 +0200
Subject: [PATCH] fix: [community admin] fixes

---
 src/Controller/UsersController.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Controller/UsersController.php b/src/Controller/UsersController.php
index 263e623..7be3d69 100644
--- a/src/Controller/UsersController.php
+++ b/src/Controller/UsersController.php
@@ -240,9 +240,11 @@ class UsersController extends AppController
     {
         $currentUser = $this->ACL->getUser();
         $validRoles = [];
+        $validOrgIds = [];
         if (!$currentUser['role']['perm_community_admin']) {
             if ($currentUser['role']['perm_group_admin']) {
                 $validRoles = $this->Users->Roles->find('list')->select(['id', 'name'])->order(['name' => 'asc'])->where(['perm_community_admin' => 0, 'perm_group_admin' => 0])->all()->toArray();
+                $validOrgIds = $this->Users->Organisations->OrgGroups->getGroupOrgIdsForUser($currentUser);
             } else {
                 $validRoles = $this->Users->Roles->find('list')->select(['id', 'name'])->order(['name' => 'asc'])->where(['perm_community_admin' => 0, 'perm_group_admin' => 0, 'perm_org_admin' => 0])->all()->toArray();
             }
@@ -266,7 +268,7 @@ class UsersController extends AppController
         ];
         if ($this->request->is(['get'])) {
             $params['fields'] = array_merge($params['fields'], ['role_id', 'disabled']);
-            if (!empty($this->ACL->getUser()['role']['perm_community_admin'])) {
+            if (!empty($this->ACL->getUser()['role']['perm_community_admin']) || !empty($this->ACL->getUser()['role']['perm_group_admin'])) {
                 $params['fields'][] = 'organisation_id';
             }
             if (!$currentUser['role']['perm_community_admin']) {
@@ -292,7 +294,16 @@ class UsersController extends AppController
             $params['fields'][] = 'role_id';
             $params['fields'][] = 'organisation_id';
             $params['fields'][] = 'disabled';
-        } else if ($this->request->is(['post', 'put']) && !empty($this->ACL->getUser()['role']['perm_org_admin'])) {
+        } else if (
+            $this->request->is(['post', 'put']) && 
+            (
+                !empty($this->ACL->getUser()['role']['perm_org_admin']) ||
+                !empty($this->ACL->getUser()['role']['perm_group_admin'])
+            )
+        ) {
+            if (!empty($this->ACL->getUser()['role']['perm_group_admin'])) {
+                $params['fields'][] = 'organisation_id';
+            }
             $params['fields'][] = 'role_id';
             $params['fields'][] = 'disabled';
             if (!$currentUser['role']['perm_community_admin']) {
@@ -321,6 +332,9 @@ class UsersController extends AppController
         $org_conditions = [];
         if (empty($currentUser['role']['perm_community_admin'])) {
             $org_conditions = ['id' => $currentUser['organisation_id']];
+            if (!empty($currentUser['role']['perm_group_admin'])) {
+                $org_conditions = ['id IN' => $validOrgIds];
+            }
         }
         if ($this->ACL->getUser()['id'] == $id) {
             $validRoles[$this->ACL->getUser()['role']['id']] = $this->ACL->getUser()['role']['name']; // include the current role of the user