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

Merge branch 'dev/user/clean-up-1' into 'develop' 

Dev/user/clean up 1

See merge request easy-solutions/apps/easyportal!10
This commit is contained in:
Charles-Edouard MARGUERITE 2026-01-28 10:30:00 +00:00
parent 85e3de647c 4b3a960e59
commit 63396cafe6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/controllers/organization_controller.js
View File

@ -63,7 +63,7 @@ export default class extends Controller {
ajaxSorting: true, ajaxSorting: true,
ajaxFiltering: true, ajaxFiltering: true,
rowHeight: 60, rowHeight: 60,
layout: "fitColumns", // activate French layout: "fitColumns",
columns: [ columns: [
{ {
title: "Logo", title: "Logo",

2
src/Controller/UserController.php
View File

@ -945,7 +945,7 @@ class UserController extends AbstractController
$data = ['user' => $uo->getUsers(), 'organization' => $uo->getOrganization()]; $data = ['user' => $uo->getUsers(), 'organization' => $uo->getOrganization()];
$token = $this->userService->generatePasswordToken($user, $org->getId()); $token = $this->userService->generatePasswordToken($user, $org->getId());
$this->emailService->sendPasswordSetupEmail($user, $token); $this->emailService->sendPasswordSetupEmail($user, $token);
$this->logger->info("Invitation email resent to user " . $user->getUserIdentifier() . " for organization " . $org->getName()); $this->loggerService->logEmailSent($userId, $org->getId(), 'Invitation Resent');
$this->organizationsService->notifyOrganizationAdmins($data, 'USER_INVITED'); $this->organizationsService->notifyOrganizationAdmins($data, 'USER_INVITED');
return $this->json(['message' => 'Invitation envoyée avec success.'], Response::HTTP_OK); return $this->json(['message' => 'Invitation envoyée avec success.'], Response::HTTP_OK);
} catch (\Exception $e) { } catch (\Exception $e) {

2
src/Form/UserForm.php
View File

@ -22,7 +22,7 @@ class UserForm extends AbstractType
->add('phoneNumber', TextType::class, ['required' => false, 'label' => 'Numéro de téléphone']) ->add('phoneNumber', TextType::class, ['required' => false, 'label' => 'Numéro de téléphone'])
->add('pictureUrl', FileType::class, [ ->add('pictureUrl', FileType::class, [
'required' => false, 'required' => false,
'label' => 'Logo', 'label' => 'Photo de profil',
'mapped' => false, // Important if the entity property is not directly mapped 'mapped' => false, // Important if the entity property is not directly mapped
'attr' => ['accept' => 'image/*'], 'attr' => ['accept' => 'image/*'],
]); ]);