composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/5324-powerportaluser-repairprofiles' into saas/3.1.0

Browse Source
This commit is contained in:
odain
2023-09-04 10:41:31 +02:00
parent 0b5a9aa5da f25e9045c9
commit 1d525e92e8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
datamodels/2.x/itop-profiles-itil/src/UserProfilesEventListener.php
View File

@@ -110,6 +110,7 @@ class UserProfilesEventListener implements iEventServiceSetup
$oProfileLinkSet = $oPreviousUser->Get('profile_list');
$oProfileLinkSet->Rewind();
$iCount = 0;
$sSingleProfileName = null;
while ($oCurrentURP_UserProfile = $oProfileLinkSet->Fetch()) {
if ($oCurrentURP_UserProfile->Get('userid') !== $oCurrentURP_UserProfile->GetOriginal('userid')) {
$sRemovedProfileId = $oCurrentURP_UserProfile->GetOriginal('profileid');
@@ -172,6 +173,7 @@ class UserProfilesEventListener implements iEventServiceSetup
$oProfileLinkSet = $oUser->Get('profile_list');
$oProfileLinkSet->Rewind();
$sSingleProfileName = null;
$iCount = 0;
while ($oCurrentURP_UserProfile = $oProfileLinkSet->Fetch()) {
if (in_array($oCurrentURP_UserProfile->GetKey(), $aDeletedURP_UserProfiles)) {
@@ -328,7 +330,11 @@ class UserProfilesEventListener implements iEventServiceSetup
}
}
public function RepairProfileChangesOrWarn(\User $oUser, string $sSingleProfileName, \URP_UserProfile $oURP_UserProfile, string $sRemovedProfileId, $bIsRemoval=false) : void {
public function RepairProfileChangesOrWarn(\User $oUser, ?string $sSingleProfileName, \URP_UserProfile $oURP_UserProfile, string $sRemovedProfileId, $bIsRemoval=false) : void {
if (is_null($sSingleProfileName)){
return;
}
if (array_key_exists($sSingleProfileName, $this->aNonStandaloneProfilesMap)) {
$sRepairingProfileId = $this->aNonStandaloneProfilesMap[$sSingleProfileName];
$sMessage = \Dict::Format("Class:User/NonStandaloneProfileWarning", $sSingleProfileName);