From 1b8aa0b628e799012e49e8b82e70ac1a51a1ee67 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Mon, 8 Feb 2021 15:20:13 +0100
Subject: [PATCH] =?UTF-8?q?Correction=20probl=C3=A8me=20d'url=20et=20de=20?=
=?UTF-8?q?droit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Metier/config/merged/reference.config.php | 84 +++++++++----------
.../config/merged/referentiel.config.php | 8 +-
.../Metier/src/Metier/Entity/Db/Reference.php | 8 +-
.../metier/partial/listing-referentiel.phtml | 2 +-
4 files changed, 50 insertions(+), 52 deletions(-)
diff --git a/module/Metier/config/merged/reference.config.php b/module/Metier/config/merged/reference.config.php
index 912c6f39e..b6b2a3dc7 100644
--- a/module/Metier/config/merged/reference.config.php
+++ b/module/Metier/config/merged/reference.config.php
@@ -19,52 +19,50 @@ return [
'bjyauthorize' => [
'guards' => [
PrivilegeController::class => [
- PrivilegeController::class => [
- [
- 'controller' => ReferenceController::class,
- 'action' => [
- 'index'
- ],
- 'privileges' => [
- ReferencemetierPrivileges::REFERENCE_INDEX
- ],
+ [
+ 'controller' => ReferenceController::class,
+ 'action' => [
+ 'index'
],
- [
- 'controller' => ReferenceController::class,
- 'action' => [
- 'ajouter',
- ],
- 'privileges' => [
- ReferencemetierPrivileges::REFERENCE_AJOUTER
- ],
+ 'privileges' => [
+ ReferencemetierPrivileges::REFERENCE_INDEX
],
- [
- 'controller' => ReferenceController::class,
- 'action' => [
- 'modifier',
- ],
- 'privileges' => [
- ReferencemetierPrivileges::REFERENCE_MODIFIER
- ],
+ ],
+ [
+ 'controller' => ReferenceController::class,
+ 'action' => [
+ 'ajouter',
],
- [
- 'controller' => ReferenceController::class,
- 'action' => [
- 'historiser',
- 'restaurer',
- ],
- 'privileges' => [
- ReferencemetierPrivileges::REFERENCE_HISTORISER
- ],
+ 'privileges' => [
+ ReferencemetierPrivileges::REFERENCE_AJOUTER
],
- [
- 'controller' => ReferenceController::class,
- 'action' => [
- 'supprimer',
- ],
- 'privileges' => [
- ReferencemetierPrivileges::REFERENCE_SUPPRIMER
- ],
+ ],
+ [
+ 'controller' => ReferenceController::class,
+ 'action' => [
+ 'modifier',
+ ],
+ 'privileges' => [
+ ReferencemetierPrivileges::REFERENCE_MODIFIER
+ ],
+ ],
+ [
+ 'controller' => ReferenceController::class,
+ 'action' => [
+ 'historiser',
+ 'restaurer',
+ ],
+ 'privileges' => [
+ ReferencemetierPrivileges::REFERENCE_HISTORISER
+ ],
+ ],
+ [
+ 'controller' => ReferenceController::class,
+ 'action' => [
+ 'supprimer',
+ ],
+ 'privileges' => [
+ ReferencemetierPrivileges::REFERENCE_SUPPRIMER
],
],
],
@@ -78,7 +76,7 @@ return [
'reference' => [
'type' => Literal::class,
'options' => [
- 'route' => 'reference',
+ 'route' => '/reference',
],
'may_terminate' => false,
'child_routes' => [
diff --git a/module/Metier/config/merged/referentiel.config.php b/module/Metier/config/merged/referentiel.config.php
index 8a8d769b7..815f5be3a 100644
--- a/module/Metier/config/merged/referentiel.config.php
+++ b/module/Metier/config/merged/referentiel.config.php
@@ -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',
],
],
],
diff --git a/module/Metier/src/Metier/Entity/Db/Reference.php b/module/Metier/src/Metier/Entity/Db/Reference.php
index 5e49de57c..298c846a1 100644
--- a/module/Metier/src/Metier/Entity/Db/Reference.php
+++ b/module/Metier/src/Metier/Entity/Db/Reference.php
@@ -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;
diff --git a/module/Metier/view/metier/metier/partial/listing-referentiel.phtml b/module/Metier/view/metier/metier/partial/listing-referentiel.phtml
index ad318f551..97beaf49f 100644
--- a/module/Metier/view/metier/metier/partial/listing-referentiel.phtml
+++ b/module/Metier/view/metier/metier/partial/listing-referentiel.phtml
@@ -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>
--
GitLab