From 768399f84daab7699da8054b78a65d36ac3d4806 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Wed, 11 Oct 2023 17:25:49 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20premier=20lors=20d'erreur=20lors=20de=20l?=
=?UTF-8?q?'intergration=20=C3=A0=20SyGAL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/module.config.php | 2 +-
documentation/101_privilege.sql | 8 ++++----
.../Service/ValidationType/ValidationTypeService.php | 12 +++++++-----
.../ValidationType/ValidationTypeServiceFactory.php | 4 ----
view/unicaen-validation/validation-type/index.phtml | 4 +++-
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/config/module.config.php b/config/module.config.php
index 39fc5b7..856caba 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -1,7 +1,7 @@
<?php
-use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
use Doctrine\ORM\Mapping\Driver\XmlDriver;
+use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
use Laminas\Router\Http\Literal;
use UnicaenPrivilege\Guard\PrivilegeController;
use UnicaenValidation\Controller\ValidationInstanceController;
diff --git a/documentation/101_privilege.sql b/documentation/101_privilege.sql
index dcfb55c..9815508 100644
--- a/documentation/101_privilege.sql
+++ b/documentation/101_privilege.sql
@@ -1,5 +1,5 @@
INSERT INTO unicaen_privilege_categorie (code, libelle, ordre, namespace)
-VALUES ('validation_type', 'Gestion des types de validation', 10000, 'UnicaenValidation\Provider\Privilege');
+VALUES ('validationtype', 'Gestion des types de validation', 10000, 'UnicaenValidation\Provider\Privilege');
INSERT INTO unicaen_privilege_privilege(CATEGORIE_ID, CODE, LIBELLE, ORDRE)
WITH d(code, lib, ordre) AS (
@@ -9,11 +9,11 @@ WITH d(code, lib, ordre) AS (
)
SELECT cp.id, d.code, d.lib, d.ordre
FROM d
-JOIN unicaen_privilege_categorie cp ON cp.CODE = 'validation_type'
+JOIN unicaen_privilege_categorie cp ON cp.CODE = 'validationtype'
;
INSERT INTO unicaen_privilege_categorie (code, libelle, ordre, namespace)
-VALUES ('validation_instance', 'Gestion des instances de validation', 10000, 'UnicaenValidation\Provider\Privilege');
+VALUES ('validationinstance', 'Gestion des instances de validation', 10000, 'UnicaenValidation\Provider\Privilege');
INSERT INTO unicaen_privilege_privilege(CATEGORIE_ID, CODE, LIBELLE, ORDRE)
WITH d(code, lib, ordre) AS (
@@ -25,5 +25,5 @@ WITH d(code, lib, ordre) AS (
)
SELECT cp.id, d.code, d.lib, d.ordre
FROM d
- JOIN unicaen_privilege_categorie cp ON cp.CODE = 'validation_instance'
+ JOIN unicaen_privilege_categorie cp ON cp.CODE = 'validationinstance'
;
\ No newline at end of file
diff --git a/src/UnicaenValidation/Service/ValidationType/ValidationTypeService.php b/src/UnicaenValidation/Service/ValidationType/ValidationTypeService.php
index ec28ac3..24dcf6d 100644
--- a/src/UnicaenValidation/Service/ValidationType/ValidationTypeService.php
+++ b/src/UnicaenValidation/Service/ValidationType/ValidationTypeService.php
@@ -2,18 +2,17 @@
namespace UnicaenValidation\Service\ValidationType;
+use Doctrine\ORM\Exception\NotSupported;
+use Doctrine\ORM\Exception\ORMException;
use Doctrine\ORM\NonUniqueResultException;
-use Doctrine\ORM\ORMException;
use Doctrine\ORM\QueryBuilder;
use Laminas\Mvc\Controller\AbstractActionController;
use UnicaenApp\Exception\RuntimeException;
use UnicaenApp\Service\EntityManagerAwareTrait;
-use UnicaenUtilisateur\Service\User\UserServiceAwareTrait;
use UnicaenValidation\Entity\Db\ValidationType;
class ValidationTypeService {
use EntityManagerAwareTrait;
- use UserServiceAwareTrait;
/** GESTION DES ENTITES *******************************************************************************************/
@@ -71,8 +70,11 @@ class ValidationTypeService {
*/
public function createQueryBuilder() : QueryBuilder
{
- $qb = $this->getEntityManager()->getRepository(ValidationType::class)->createQueryBuilder('vtype')
- ;
+ try {
+ $qb = $this->getEntityManager()->getRepository(ValidationType::class)->createQueryBuilder('vtype');
+ } catch (NotSupported $e) {
+ throw new RuntimeException("Un problème est survenu lors de la création du QueryBuilder de [".ValidationType::class."]",0,$e);
+ }
return $qb;
}
diff --git a/src/UnicaenValidation/Service/ValidationType/ValidationTypeServiceFactory.php b/src/UnicaenValidation/Service/ValidationType/ValidationTypeServiceFactory.php
index ec92356..061c340 100644
--- a/src/UnicaenValidation/Service/ValidationType/ValidationTypeServiceFactory.php
+++ b/src/UnicaenValidation/Service/ValidationType/ValidationTypeServiceFactory.php
@@ -6,7 +6,6 @@ use Doctrine\ORM\EntityManager;
use Interop\Container\ContainerInterface;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
-use UnicaenUtilisateur\Service\User\UserService;
class ValidationTypeServiceFactory {
@@ -20,14 +19,11 @@ class ValidationTypeServiceFactory {
{
/**
* @var EntityManager $entityManager
- * @var UserService $userService
*/
$entityManager = $container->get('doctrine.entitymanager.orm_default');
- $userService = $container->get(UserService::class);
$service = new ValidationTypeService();
$service->setEntityManager($entityManager);
- $service->setUserService($userService);
return $service;
}
}
\ No newline at end of file
diff --git a/view/unicaen-validation/validation-type/index.phtml b/view/unicaen-validation/validation-type/index.phtml
index d66f148..5417d4c 100644
--- a/view/unicaen-validation/validation-type/index.phtml
+++ b/view/unicaen-validation/validation-type/index.phtml
@@ -15,8 +15,10 @@ $canAfficher = $this->isAllowed(ValidationtypePrivileges::getResourceId(Validati
$canAjouter = $this->isAllowed(ValidationtypePrivileges::getResourceId(ValidationtypePrivileges::VALIDATIONTYPE_MODIFIER));
$canModifier = $this->isAllowed(ValidationtypePrivileges::getResourceId(ValidationtypePrivileges::VALIDATIONTYPE_MODIFIER));
$canDetruire = $this->isAllowed(ValidationtypePrivileges::getResourceId(ValidationtypePrivileges::VALIDATIONTYPE_DETRUIRE));
-
$canAfficherInstance = $this->isAllowed(ValidationInstancePrivileges::getResourceId(ValidationInstancePrivileges::VALIDATIONINSTANCE_AFFICHER));
+
+
+var_dump($canAfficher);
?>
<div class="row">
--
GitLab