Commit ecaec9b8 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Ajustement fonction et signature

parent 987a499e

src/UnicaenPrivilege/Service/Privilege/PrivilegeService.php

+13 −0
Original line number Diff line number Diff line
@@ -48,6 +48,19 @@ class PrivilegeService extends CommonService implements PrivilegeProviderInterfa 
        return $this->getRepo()->findOneBy(['code' => $code, 'categorie' => $categorie]);

    }



    /**

     * @param string $code

     * @return PrivilegeInterface|null

     */

    public function findByFullCode(string $code) : ?PrivilegeInterface

    {

        [$categorieCode, $privilegeCode] = explode('-', $code);

        $categorie = $this->getPrivilegeCategorieService()->findByCode($categorieCode);

        if ($categorie === null) return null;

        $privilege = $this->findByCode($privilegeCode, $categorie);

        return $privilege;

    }



    /**

     * @param string $libelle

     * @param int|PrivilegeCategorieInterface $categorie

src/UnicaenPrivilege/View/Privilege/PrivilegeViewHelper.php

+4 −4
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ class PrivilegeViewHelper extends AbstractHelper 
        return $this->view->isAllowed(PrivilegePrivileges::getResourceId(PrivilegePrivileges::PRIVILEGE_AFFECTER))

            ? sprintf(

                '<a href="%s" class="modifier-privilege"

                    data-toggle="tooltip" 

                    data-bs-toggle="tooltip" 

                    data-original-title="<span class=\'text-highlight\'><small>Activer le privilège <br/> <strong><em>%s</em></strong> <br/> pour le rôle <br/> <strong><em>%s</em></strong></small></span>">

                    <i class="fas fa-times-circle text-danger"></i>

                </a>',
@@ -47,7 +47,7 @@ class PrivilegeViewHelper extends AbstractHelper 
                $role

            )

            : sprintf(

                '<a data-toggle="tooltip" 

                '<a data-bs-toggle="tooltip" 

                    data-original-title="<span class=\'text-highlight\'><small>Privilège <br/> <strong><em>%s</em></strong> <br/> Rôle <br/> <strong><em>%s</em></strong></small></span>">

                    <i class="fas fa-times-circle text-danger"></i>

                </a>',
@@ -65,7 +65,7 @@ class PrivilegeViewHelper extends AbstractHelper 
        return $this->view->isAllowed(PrivilegePrivileges::getResourceId(PrivilegePrivileges::PRIVILEGE_AFFECTER))

            ? sprintf(

                '<a href="%s" class="modifier-privilege"

                    data-toggle="tooltip" 

                    data-bs-toggle="tooltip" 

                    data-original-title="<span class=\'text-highlight\'><small>Désactiver le privilège <br/> <strong><em>%s</em></strong> <br/> pour le rôle <br/> <strong><em>%s</em></strong></small></span>">

                    <i class="fas fa-check-circle text-success"></i>

                </a>',
@@ -74,7 +74,7 @@ class PrivilegeViewHelper extends AbstractHelper 
                $role

            )

            : sprintf(

                '<a data-toggle="tooltip" 

                '<a data-bs-toggle="tooltip" 

                    data-original-title="<span class=\'text-highlight\'><small>Privilège <br/> <strong><em>%s</em></strong> <br/> Rôle <br/> <strong><em>%s</em></strong></small></span>">

                    <i class="fas fa-check-circle text-success"></i>

                </a>',

view/unicaen-privilege/privilege-categorie/index.phtml

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ $canProvider = $this->isAllowed(PrivilegePrivileges::getResourceId(PrivilegePriv 
                    </td>

                    <td><?php echo $categorie->getCode(); ?></td>

                    <td>

                        <a href="#" data-toggle="popover" data-placement="left" data-html="true"

                        <a href="#" data-toggle="popover" data-placement="left" data-bs-html="true"

                           data-content="<?php echo implode("<br />", $listing); ?>">

                            <i class="fas fa-crown"></i> <?php echo $categorie->getPrivileges()->count(); ?>

                        </a>

view/unicaen-privilege/privilege/index.phtml

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ use UnicaenPrivilege\Provider\Privilege\PrivilegePrivileges; 


        <?php //Note tv : Cause une erreur JS car a priori déjà fait ailleur mais je n'ais pas trouvé ou?>

        // body.tooltip({

        //     selector: '[data-toggle="tooltip"]',

        //     selector: '[data-bs-toggle="tooltip"]',

        //     placement: "bottom",

        //     html: true

        // });