From 7216b9ec10993a380536b09ebad80dfad19344fd Mon Sep 17 00:00:00 2001 From: Scott Koranda Date: Fri, 20 Dec 2024 07:29:38 -0600 Subject: [PATCH] UnixCluster CO Group is not deleted (CO-2872) --- .../UnixCluster/Model/UnixCluster.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/AvailablePlugin/UnixCluster/Model/UnixCluster.php b/app/AvailablePlugin/UnixCluster/Model/UnixCluster.php index bf1e6bf15..43bd22a4a 100644 --- a/app/AvailablePlugin/UnixCluster/Model/UnixCluster.php +++ b/app/AvailablePlugin/UnixCluster/Model/UnixCluster.php @@ -309,6 +309,19 @@ public function assign($cluster, $coPersonId) { ->CoGroup ->Identifier ->field('co_group_id', $args['conditions']); + + // Make sure the group is not deleted. + if(!empty($userCoGroupId)) { + $args = array(); + $args['conditions']['CoGroup.id'] = $userCoGroupId; + $args['contain'] = false; + + $g = $this->Cluster->Co->CoGroup->find('first', $args); + + if($g['CoGroup']['deleted']) { + $userCoGroupId = null; + } + } if(!empty($userCoGroupId)) { $acct['primary_co_group_id'] = $userCoGroupId;