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

Dev/user/clean up 1

See merge request easy-solutions/apps/easyportal!10

assets/controllers/organization_controller.js

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

src/Controller/UserController.php

@@ -945,7 +945,7 @@ class UserController extends AbstractController
                 $data = ['user' => $uo->getUsers(), 'organization' => $uo->getOrganization()];
                 $token = $this->userService->generatePasswordToken($user, $org->getId());
                 $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');
                 return $this->json(['message' => 'Invitation envoyée avec success.'], Response::HTTP_OK);
             } catch (\Exception $e) {

src/Form/UserForm.php

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