Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/support/3.1' into support/3.2
Browse files Browse the repository at this point in the history
# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/src/Controller/UserProfileBrickController.php
  • Loading branch information
jf-cbd committed Jan 21, 2025
2 parents 80244e2 + a07f66c commit 7e9a95f
Showing 1 changed file with 1 addition and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,7 @@ public function DisplayAction(Request $oRequest, $sBrickId)
$sCurContactId = $oCurContact->GetKey();

// Preparing forms
$aData['forms']['contact'] = $this->ObjectFormHandlerHelper->HandleForm($oRequest, $sFormMode, $sCurContactClass,
$sCurContactId,
);
$aData['forms']['contact'] = $this->ObjectFormHandlerHelper->HandleForm($oRequest, $sFormMode, $sCurContactClass, $sCurContactId, $oBrick->GetForm());
$aData['forms']['preferences'] = $this->HandlePreferencesForm($oRequest, $sFormMode);
// - If user can change password, we display the form
$aData['forms']['password'] = (UserRights::CanChangePassword()) ? $this->HandlePasswordForm($oRequest, $sFormMode) : null;
Expand Down

0 comments on commit 7e9a95f

Please sign in to comment.