diff --git a/CHANGELOG.md b/CHANGELOG.md index 4093f6859a5cf2a483eb18c879b1a1ac0295f930..82a6243eca7469f31c4de33c9ce8444a66a60676 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,3 +6,7 @@ Journal des modifications - Mise en place du changelog - Réintégration de l'AssertionFactory, à utiliser pour les assertions - [Fix] erreur ns \InvalidArgumentException : \ ajouté + +5.0.7 (05/05/2023) +----- +- Correction bug d'affichage sur le tableau d'affectation lorsque deux catégories possèdent le même libellé diff --git a/config/merged/privilege.config.php b/config/merged/privilege.config.php index 3d1a1c0401b5af8d55df7a99c2f26805c5465c00..c274038a74042d41c905a366e4ff8aa03b0e5a66 100644 --- a/config/merged/privilege.config.php +++ b/config/merged/privilege.config.php @@ -120,6 +120,7 @@ return [ 'options' => [ 'route' => '/privilege', 'defaults' => [ + /** @see PrivilegeController::indexAction() */ 'controller' => PrivilegeController::class, 'action' => 'index', ], diff --git a/src/UnicaenPrivilege/Service/Privilege/PrivilegeService.php b/src/UnicaenPrivilege/Service/Privilege/PrivilegeService.php index 9963f05dcf876ace2389d6590caac5211f9e326e..47d6f26bf4665d3a51e6a92d0436c5a4d014379a 100644 --- a/src/UnicaenPrivilege/Service/Privilege/PrivilegeService.php +++ b/src/UnicaenPrivilege/Service/Privilege/PrivilegeService.php @@ -147,7 +147,7 @@ class PrivilegeService extends CommonService implements PrivilegeProviderInterfa foreach ($categories as $c) { $privileges = $this->findByCategorie($c); if(count($privileges) > 0) { - $privilegesByCategorie[$c->getLibelle()] = $privileges; + $privilegesByCategorie[$c->getId()] = $privileges; } } diff --git a/src/UnicaenPrivilege/View/Privilege/PrivilegeViewHelper.php b/src/UnicaenPrivilege/View/Privilege/PrivilegeViewHelper.php index 803dc93f30b7203cd98eae1f87886f856f7a4a6c..0c6ea8e979eba1040b9d8faf01b1e3183e6d55c3 100644 --- a/src/UnicaenPrivilege/View/Privilege/PrivilegeViewHelper.php +++ b/src/UnicaenPrivilege/View/Privilege/PrivilegeViewHelper.php @@ -90,9 +90,10 @@ class PrivilegeViewHelper extends AbstractHelper public function renderStatut($role) { $check = $this->privilege->hasRole($role); - $html = '<td class="role-privilege-statut text-center %s" style="border-right: 1px solid #ddd;">%s</td>'; + $html = '<td class="role-privilege-statut text-center %s" style="border-right: 1px solid #ddd;" title="%s">%s</td>'; return sprintf($html, $check ? 'success' : 'danger', + ($check? 'Ajouter' : 'Retirer') . " le privilège [".$this->privilege->getCategorie()->getLibelle()."|".$this->privilege->getLibelle()."] au rôle [".$role->getLibelle()."]", $check ? $this->renderLienSupprimer($role) : $this->renderLienAjouter($role) ); } diff --git a/view/unicaen-privilege/privilege/index.phtml b/view/unicaen-privilege/privilege/index.phtml index ce7d00e039c329c22d77a93b33bb31082671ca93..e91574b60c3c3dd1425edb247d9eb0fa456dc010 100644 --- a/view/unicaen-privilege/privilege/index.phtml +++ b/view/unicaen-privilege/privilege/index.phtml @@ -1,9 +1,8 @@ <?php -use UnicaenAuth\Entity\Db\RoleInterface; use UnicaenPrivilege\Entity\Db\PrivilegeInterface; use UnicaenPrivilege\Form\Privilege\CategorieFiltreForm; -use UnicaenPrivilege\Provider\Privilege\PrivilegePrivileges; +use UnicaenUtilisateur\Entity\Db\RoleInterface; /** * @var RoleInterface[] $roles @@ -89,11 +88,12 @@ $this->headTitle("Gestion des privilèges"); </tr> </thead> <tbody> - <?php foreach ($privilegesByCategorie as $libelleCategorie => $privileges) : ?> + <?php foreach ($privilegesByCategorie as $categorieId => $privileges) : ?> <tr> - <th id="<?php echo current($privileges)->getCategorie()->getId(); ?>" class="categorie" - colspan="<?php echo 1 + count($roles); ?>"><?php echo $libelleCategorie; ?> <i - class="fas fa-caret-square-down text-muted"></i></th> + <th id="<?php echo $categorieId; ?>" class="categorie" colspan="<?php echo 1 + count($roles); ?>"> + <?php echo current($privileges)->getCategorie()->getLibelle(); ?> + <i class="fas fa-caret-square-down text-muted"></i> + </th> </tr> <?php /** @var PrivilegeInterface $privilege */ ?> <?php foreach ($privileges as $privilege) : ?>