Loading module/Application/src/Application/Controller/PrivilegeController.php +1 −1 Original line number Diff line number Diff line Loading @@ -36,7 +36,7 @@ class PrivilegeController extends AbstractController ->leftJoin('r.structure', 's') ->addSelect('ts') ->leftJoin('s.typeStructure', 'ts') ->orderBy("r.typeStructureDependant, r.libelle, r.structure", 'asc'); ->orderBy("r.typeStructureDependant, r.ordreAffichage, r.structure", 'asc'); $this->applyFilterDependance($qbRoles, $depend); $this->applyFilterRole($qbRoles, $role); /** @var Role[] $roles */ Loading module/Application/view/application/privilege/index.phtml +9 −7 Original line number Diff line number Diff line Loading @@ -44,7 +44,7 @@ $canModifier = $this->isAllowed(Privileges::getResourceId(Privileges::DROIT_PRIV $depend = ""; if ($role->isTheseDependant()) { $depend = "these"; } else { } elseif ($role->isStructureDependant()) { if ($role->getStructure() === null) { $sigleStructure = "structure manquante"; } else { Loading @@ -53,13 +53,15 @@ $canModifier = $this->isAllowed(Privileges::getResourceId(Privileges::DROIT_PRIV } $sigleStructure = ""; if ($role->isStructureDependant()) { if ($role->getStructure() === null) { $sigleStructure = "structure manquante"; } elseif ($role->getStructure()->getSigle() === null || $role->getStructure()->getSigle() === "") { } elseif (!$role->getStructure()->getSigle()) { $sigleStructure = "sigle manquant"; } else { $sigleStructure = $role->getStructure()->getSigle(); } } ?> <?php echo $role->getLibelle(); ?> <?php if (!$role->getProfils()->isEmpty()): ?> Loading @@ -69,7 +71,7 @@ $canModifier = $this->isAllowed(Privileges::getResourceId(Privileges::DROIT_PRIV } ?>"></span> <?php else : ?> <span class="fas fa-exclamation-triangle text-warning" title="Aucun profil d'assigné à ce rôle"></span> title="Aucun profil assigné à ce rôle"></span> <?php endif; ?> <br/> Loading Loading @@ -102,9 +104,9 @@ $canModifier = $this->isAllowed(Privileges::getResourceId(Privileges::DROIT_PRIV ?> <td class="droit" id="<?php echo $id; ?>" title="<?php echo $title; ?>"> <?php if (array_search($role, $privilegeRoles) !== false) : ?> <span class="icon icon-oui text-success"></span> <span class="icon icon-checked text-success"></span> <?php else: ?> <span class="icon icon-delete iconly text-danger"></span> <span class="icon icon-unchecked iconly text-danger"></span> <?php endif; ?> </td> <?php endforeach; ?> Loading Loading @@ -139,8 +141,8 @@ $canModifier = $this->isAllowed(Privileges::getResourceId(Privileges::DROIT_PRIV success: function (retour) { var texte = ""; if (retour == 1) texte = "<span class='icon icon-oui text-success'></span>"; else var texte = "<span class='icon icon-delete iconly text-danger'></span>"; if (retour == 1) texte = "<span class='icon icon-checked text-success'></span>"; else var texte = "<span class='icon icon-unchecked iconly text-danger'></span>"; document.getElementById(id).innerHTML = texte; } }); Loading module/Application/view/unicaen-auth/droits/index.phtml +1 −1 Original line number Diff line number Diff line Loading @@ -29,7 +29,7 @@ $canViewProfils = $this->isAllowed(Privileges::getResourceId(Privileges::DROIT_P <?php if ($canViewProfils): ?> <dt><a href="<?php echo $this->url('profil') ?>">Gestion des profils de rôles</a></dt> <dd> Outils permettant de gêrer les profils associés aux rôles, ainsi que de gêrer les privilèges associées à chaque profil. Outils permettant de g'rer les profils associés aux rôles, ainsi que de gérer les privilèges associés à chaque profil. </dd> <?php endif; ?> </dl> Loading Loading
module/Application/src/Application/Controller/PrivilegeController.php +1 −1 Original line number Diff line number Diff line Loading @@ -36,7 +36,7 @@ class PrivilegeController extends AbstractController ->leftJoin('r.structure', 's') ->addSelect('ts') ->leftJoin('s.typeStructure', 'ts') ->orderBy("r.typeStructureDependant, r.libelle, r.structure", 'asc'); ->orderBy("r.typeStructureDependant, r.ordreAffichage, r.structure", 'asc'); $this->applyFilterDependance($qbRoles, $depend); $this->applyFilterRole($qbRoles, $role); /** @var Role[] $roles */ Loading
module/Application/view/application/privilege/index.phtml +9 −7 Original line number Diff line number Diff line Loading @@ -44,7 +44,7 @@ $canModifier = $this->isAllowed(Privileges::getResourceId(Privileges::DROIT_PRIV $depend = ""; if ($role->isTheseDependant()) { $depend = "these"; } else { } elseif ($role->isStructureDependant()) { if ($role->getStructure() === null) { $sigleStructure = "structure manquante"; } else { Loading @@ -53,13 +53,15 @@ $canModifier = $this->isAllowed(Privileges::getResourceId(Privileges::DROIT_PRIV } $sigleStructure = ""; if ($role->isStructureDependant()) { if ($role->getStructure() === null) { $sigleStructure = "structure manquante"; } elseif ($role->getStructure()->getSigle() === null || $role->getStructure()->getSigle() === "") { } elseif (!$role->getStructure()->getSigle()) { $sigleStructure = "sigle manquant"; } else { $sigleStructure = $role->getStructure()->getSigle(); } } ?> <?php echo $role->getLibelle(); ?> <?php if (!$role->getProfils()->isEmpty()): ?> Loading @@ -69,7 +71,7 @@ $canModifier = $this->isAllowed(Privileges::getResourceId(Privileges::DROIT_PRIV } ?>"></span> <?php else : ?> <span class="fas fa-exclamation-triangle text-warning" title="Aucun profil d'assigné à ce rôle"></span> title="Aucun profil assigné à ce rôle"></span> <?php endif; ?> <br/> Loading Loading @@ -102,9 +104,9 @@ $canModifier = $this->isAllowed(Privileges::getResourceId(Privileges::DROIT_PRIV ?> <td class="droit" id="<?php echo $id; ?>" title="<?php echo $title; ?>"> <?php if (array_search($role, $privilegeRoles) !== false) : ?> <span class="icon icon-oui text-success"></span> <span class="icon icon-checked text-success"></span> <?php else: ?> <span class="icon icon-delete iconly text-danger"></span> <span class="icon icon-unchecked iconly text-danger"></span> <?php endif; ?> </td> <?php endforeach; ?> Loading Loading @@ -139,8 +141,8 @@ $canModifier = $this->isAllowed(Privileges::getResourceId(Privileges::DROIT_PRIV success: function (retour) { var texte = ""; if (retour == 1) texte = "<span class='icon icon-oui text-success'></span>"; else var texte = "<span class='icon icon-delete iconly text-danger'></span>"; if (retour == 1) texte = "<span class='icon icon-checked text-success'></span>"; else var texte = "<span class='icon icon-unchecked iconly text-danger'></span>"; document.getElementById(id).innerHTML = texte; } }); Loading
module/Application/view/unicaen-auth/droits/index.phtml +1 −1 Original line number Diff line number Diff line Loading @@ -29,7 +29,7 @@ $canViewProfils = $this->isAllowed(Privileges::getResourceId(Privileges::DROIT_P <?php if ($canViewProfils): ?> <dt><a href="<?php echo $this->url('profil') ?>">Gestion des profils de rôles</a></dt> <dd> Outils permettant de gêrer les profils associés aux rôles, ainsi que de gêrer les privilèges associées à chaque profil. Outils permettant de g'rer les profils associés aux rôles, ainsi que de gérer les privilèges associés à chaque profil. </dd> <?php endif; ?> </dl> Loading