From d9df6ed4c391ca509f5aecdbf962b338af00afdd Mon Sep 17 00:00:00 2001 From: Sami Mokaddem Date: Tue, 17 Jan 2023 09:23:24 +0100 Subject: [PATCH] fix: [permissionLimitations] Prevent error for org without users --- src/Model/Table/PermissionLimitationsTable.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Model/Table/PermissionLimitationsTable.php b/src/Model/Table/PermissionLimitationsTable.php index abb8543..6300823 100644 --- a/src/Model/Table/PermissionLimitationsTable.php +++ b/src/Model/Table/PermissionLimitationsTable.php @@ -63,12 +63,15 @@ class PermissionLimitationsTable extends AppTable ])->count(); } if (isset($data['global'])) { + $conditions = [ + 'scope' => 'user', + 'field' => $field, + ]; + if (!empty($ownOrgUserIds)) { + $conditions['parent_id IN'] = array_values($ownOrgUserIds); + } $limitations[$field]['organisation']['current'] = $MetaFields->find('all', [ - 'conditions' => [ - 'scope' => 'user', - 'field' => $field, - 'parent_id IN' => array_values($ownOrgUserIds) - ] + 'conditions' => $conditions, ])->count(); } }