FIX #8426 remove user from group, entity and diffusion list when user status is del

modules/entities/class/class_manage_listdiff_Abstract.php

@@ -115,6 +115,7 @@ abstract class diffusion_list_Abstract extends functions
                     .'and l.object_type = ? '
                     .'and l.object_id = ? '
                     ."and u.enabled = 'Y' "
+                    ."and u.status != 'DEL' "
                 .'ORDER BY l.sequence', array($item_mode, $objectType, $objectId));
             while ($user = $stmt->fetchObject()) {
                 if (!isset($listmodel[$role_id])) {

src/app/entity/controllers/EntityController.php

@@ -99,15 +99,18 @@ class EntityController
             if ($listTemplate['object_type'] == 'entity_id' && !empty($listTemplate['item_id'])) {
                 $entity['listTemplate']['id'] = $listTemplate['id'];
                 if ($listTemplate['item_type'] == 'user_id') {
-                    $entity['listTemplate'][$listTemplate['item_mode']][] = [
-                        'item_type'             => $listTemplate['item_type'],
-                        'item_id'               => $listTemplate['item_id'],
-                        'sequence'              => $listTemplate['sequence'],
-                        'title'                 => $listTemplate['title'],
-                        'description'           => $listTemplate['description'],
-                        'labelToDisplay'        => UserModel::getLabelledUserById(['userId' => $listTemplate['item_id']]),
-                        'descriptionToDisplay'  => UserModel::getPrimaryEntityByUserId(['userId' => $listTemplate['item_id']])['entity_label']
-                    ];
+                    $statusUser = UserModel::getByUserId(['select' => ['status'], 'userId' => $listTemplate['item_id']]);
+                    if ($statusUser['status'] != 'DEL') {
+                        $entity['listTemplate'][$listTemplate['item_mode']][] = [
+                            'item_type'             => $listTemplate['item_type'],
+                            'item_id'               => $listTemplate['item_id'],
+                            'sequence'              => $listTemplate['sequence'],
+                            'title'                 => $listTemplate['title'],
+                            'description'           => $listTemplate['description'],
+                            'labelToDisplay'        => UserModel::getLabelledUserById(['userId' => $listTemplate['item_id']]),
+                            'descriptionToDisplay'  => UserModel::getPrimaryEntityByUserId(['userId' => $listTemplate['item_id']])['entity_label']
+                        ];
+                    }
                 } elseif ($listTemplate['item_type'] == 'entity_id') {
                     $entity['listTemplate'][$listTemplate['item_mode']][] = [
                         'item_type'             => $listTemplate['item_type'],
@@ -135,7 +138,12 @@ class EntityController
             }
         }
 
-        $entity['users'] = EntityModel::getUsersById(['id' => $entity['entity_id'], 'select' => ['users.id','users.user_id', 'users.firstname', 'users.lastname']]);
+        $tmpUsers = EntityModel::getUsersById(['id' => $entity['entity_id'], 'select' => ['users.id','users.user_id', 'users.firstname', 'users.lastname', 'users.status']]);
+        foreach ($tmpUsers as $tmpUser) {
+            if ($tmpUser['status'] != 'DEL') {
+                $entity['users'][] = array_slice($tmpUser, 0, 4, true);
+            }
+        }
         $children = EntityModel::get(['select' => [1], 'where' => ['parent_entity_id = ?'], 'data' => [$aArgs['id']]]);
         $entity['hasChildren'] = count($children) > 0;
         $documents = ResModel::get(['select' => [1], 'where' => ['destination = ?'], 'data' => [$aArgs['id']]]);

src/app/group/controllers/GroupController.php

@@ -137,7 +137,12 @@ class GroupController
 
         $group['security']          = GroupModel::getSecurityByGroupId(['groupId' => $group['group_id']]);
         $group['services']          = GroupModel::getAllServicesByGroupId(['groupId' => $group['group_id']]);
-        $group['users']             = GroupModel::getUsersByGroupId(['groupId' => $group['group_id'], 'select' => ['users.id', 'users.user_id', 'users.firstname', 'users.lastname']]);
+        $tmpUsers                   = GroupModel::getUsersByGroupId(['groupId' => $group['group_id'], 'select' => ['users.id', 'users.user_id', 'users.firstname', 'users.lastname', 'users.status']]);
+        foreach ($tmpUsers as $tmpUser) {
+            if ($tmpUser['status'] != 'DEL') {
+                $group['users'][] = array_slice($tmpUser, 0, 4, true);
+            }
+        }
         $group['baskets']           = GroupBasketModel::getBasketsByGroupId(['select' => ['baskets.basket_id', 'baskets.basket_name', 'baskets.basket_desc'], 'groupId' => $group['group_id']]);
         $group['canAdminUsers']     = ServiceModel::hasService(['id' => 'admin_users', 'userId' => $GLOBALS['userId'], 'location' => 'apps', 'type' => 'admin']);
         $group['canAdminBaskets']   = ServiceModel::hasService(['id' => 'admin_baskets', 'userId' => $GLOBALS['userId'], 'location' => 'basket', 'type' => 'admin']);