Charles-Edouard
/
Easy_solution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev/user/update-1' into 'develop' 

Dev/user/update 1

See merge request easy-solutions/apps/easyportal!16
This commit is contained in:
Charles-Edouard MARGUERITE 2026-01-28 15:19:47 +00:00
parent ac532dcf89 99a68dad4d
commit fef74fea64
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Controller/SecurityController.php
View File

@ -144,6 +144,7 @@ class SecurityController extends AbstractController
if ($uo) { if ($uo) {
$uo->setStatut("ACCEPTED"); $uo->setStatut("ACCEPTED");
$uo->setIsActive(true); $uo->setIsActive(true);
$user->setIsActive(true);
$this->entityManager->persist($uo); $this->entityManager->persist($uo);
$this->entityManager->flush(); $this->entityManager->flush();
$this->loggerService->logOrganizationInformation($orgId, $user->getId(), 'User accepted organization invitation during password reset.'); $this->loggerService->logOrganizationInformation($orgId, $user->getId(), 'User accepted organization invitation during password reset.');

2
src/Service/UserService.php
View File

@ -596,7 +596,7 @@ class UserService
// Generate token here if it's part of the user persistence flow // Generate token here if it's part of the user persistence flow
$token = $this->generatePasswordToken($user); $token = $this->generatePasswordToken($user);
$user->setisActive(false);
$this->entityManager->persist($user); $this->entityManager->persist($user);
$this->entityManager->flush(); $this->entityManager->flush();

2
templates/organization/edit.html.twig
View File

@ -8,7 +8,7 @@
</div> </div>
<div class="card-body"> <div class="card-body">
{{ form_start(form, {'action': path('organization_edit', {'id': organization.id}), 'method': 'PUT'}) }} {{ form_start(form, {'action': path('organization_edit', {'id': organization.id}), 'method': 'POST'}) }}
{{ form_widget(form) }} {{ form_widget(form) }}
<button type="submit" class="btn btn-primary">Enregistrer</button> <button type="submit" class="btn btn-primary">Enregistrer</button>
{{ form_end(form) }} {{ form_end(form) }}