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

Correction problème d'url et de droit

parent 14298ae7

module/Metier/config/merged/reference.config.php

+41 −43
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ use Zend\Router\Http\Segment; 
return [

    'bjyauthorize' => [

        'guards' => [

            PrivilegeController::class => [

            PrivilegeController::class => [

                [

                    'controller' => ReferenceController::class,
@@ -69,7 +68,6 @@ return [ 
            ],

        ],

    ],

    ],



    'router'          => [

        'routes' => [
@@ -78,7 +76,7 @@ return [ 
                    'reference' => [

                        'type'  => Literal::class,

                        'options' => [

                            'route' => 'reference',

                            'route' => '/reference',

                        ],

                        'may_terminate' => false,

                        'child_routes' => [

module/Metier/config/merged/referentiel.config.php

+4 −4
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ return [ 
                    'referentiel' => [

                        'type'  => Literal::class,

                        'options' => [

                            'route' => 'referentiel',

                            'route' => '/referentiel',

                        ],

                        'may_terminate'=> false,

                        'child_routes' => [
@@ -120,13 +120,13 @@ return [ 
                                    ],

                                ],

                            ],

                            'effacer' => [

                            'supprimer' => [

                                'type'  => Segment::class,

                                'options' => [

                                    'route'    => '/effacer/:referentiel',

                                    'route'    => '/supprimer/:referentiel',

                                    'defaults' => [

                                        'controller' => ReferentielController::class,

                                        'action'     => 'effacer',

                                        'action'     => 'supprimer',

                                    ],

                                ],

                            ],

module/Metier/src/Metier/Entity/Db/Reference.php

+4 −4
Original line number Diff line number Diff line
@@ -132,18 +132,18 @@ class Reference implements HistoriqueAwareInterface { 
    }



    /**

     * @return int

     * @return int|null

     */

    public function getPage()

    public function getPage() : ?int

    {

        return $this->page;

    }



    /**

     * @param int $page

     * @param int|null $page

     * @return Reference

     */

    public function setPage(int $page)

    public function setPage(?int $page) : Reference

    {

        $this->page = $page;

        return $this;

module/Metier/view/metier/metier/partial/listing-referentiel.phtml

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ $canEffacer = $droits["effacer"]; 
                <?php endif; ?>

                <?php if ($canEffacer) : ?>

                    <a  <?php /** @see \Metier\Controller\ReferentielController::supprimerAction() */ ?>

                        href="<?php echo $this->url('metier/referentiel/effacer', ['referentiel' => $referentiel->getId()], [], true); ?>"

                        href="<?php echo $this->url('metier/referentiel/supprimer', ['referentiel' => $referentiel->getId()], [], true); ?>"

                        class="ajax-modal" data-event="modification"

                    >

                        <span class="icon detruire"  title="Supprimer le référentiel métier"></span></a>