Merge branch 'develop'

cerebrate-project · Jun 18, 2024 · ad04362 · ad04362
2 parents 52a1635 + f3f369b
commit ad04362
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/Model/Table/PermissionLimitationsTable.php b/src/Model/Table/PermissionLimitationsTable.php
@@ -37,7 +37,8 @@ public function getListOfLimitations(\App\Model\Entity\User $data)
                 'keyField' => 'id',
                 'valueField' => 'id',
                 'conditions' => [
-                    'organisation_id' => $data['organisation_id']
+                    'organisation_id' => $data['organisation_id'],
+                    'disabled' => false
                 ]
             ])->all()->toList();
         }
@@ -58,11 +59,19 @@ public function getListOfLimitations(\App\Model\Entity\User $data)
             }
         }
         foreach ($limitations as $field => $data) {
+            $disabledUserIds = $Users->find('list', [
+                'keyField' => 'id',
+                'valueField' => 'id',
+                'conditions' => [
+                    'disabled' => true
+                ]
+            ])->all()->toList();
             if (isset($data['global'])) {
                 $limitations[$field]['global']['current'] = $MetaFields->find('all', [
                     'conditions' => [
                         'scope' => 'user',
-                        'field' => $field
+                        'field' => $field,
+                        'parent_id NOT IN' => $disabledUserIds
                     ]
                 ])->count();
             }