diff --git a/src/Entity/UsersOrganizations.php b/src/Entity/UsersOrganizations.php index 0e27cb0..26b319b 100644 --- a/src/Entity/UsersOrganizations.php +++ b/src/Entity/UsersOrganizations.php @@ -42,6 +42,7 @@ class UsersOrganizations public function __construct() { $this->apps = new ArrayCollection(); + $this->isActive = true; // Default value for isActive } public function getId(): ?int diff --git a/templates/elements/userOrganizationInformation.html.twig b/templates/user/organization/userOrganizationInformation.html.twig similarity index 84% rename from templates/elements/userOrganizationInformation.html.twig rename to templates/user/organization/userOrganizationInformation.html.twig index b1cfc72..7cf4fe8 100644 --- a/templates/elements/userOrganizationInformation.html.twig +++ b/templates/user/organization/userOrganizationInformation.html.twig @@ -24,9 +24,11 @@
Role: {% if roles|length > 0 %} {% set firstRole = roles[0] %} - {% if firstRole.name == "SUPER ADMIN" or firstRole.name == "ADMIN" %} - {{ firstRole.name|capitalize }} - {% else %} + {% if firstRole.name == "SUPER ADMIN" %} + Super Administrateur + {% elseif firstRole.name == "ADMIN" %} + Administrateur + {% else %} {{ firstRole.name|capitalize }} {% endif %} {% else %} @@ -51,8 +53,10 @@ {% if roles|length > 1 %}
Autres rĂ´les: {% for role in roles|slice(1) %} - {% if role.name == "SUPER ADMIN" or role.name == "ADMIN" %} - {{ role.name|capitalize }} + {% if role.name == "SUPER ADMIN"%} + Super Administrateur + {% elseif role.name == "ADMIN" %} + Administrateur {% else %} {{ role.name|capitalize }} {% endif %} diff --git a/templates/user/profile.html.twig b/templates/user/profile.html.twig index 2ad40f4..b7c10c9 100644 --- a/templates/user/profile.html.twig +++ b/templates/user/profile.html.twig @@ -17,7 +17,7 @@ {% else %} {% for organization in userOrganizations %} - {% include 'elements/userOrganizationInformation.html.twig' + {% include 'user/organization/userOrganizationInformation.html.twig' with {'organization': organization.organization, 'roles': organization.roles, 'apps': organization.apps, 'uoId': organization.uoId} %} {% endfor %} {% endif %}