Commit 10b3fde1 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Pages Droits d'accès : cosmétique.

parent 48d0f952
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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 */
+9 −7
Original line number Diff line number Diff line
@@ -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 {
@@ -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()): ?>
@@ -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/>
@@ -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; ?>
@@ -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;
                    }
            });
+1 −1
Original line number Diff line number Diff line
@@ -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>