Fix premier lors d'erreur lors de l'intergration à SyGAL (768399f8) · Commits · lib / unicaen / validation

config/module.config.php

+1 −1

Original line number	Diff line number	Diff line
		<?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;

+4 −4

Original line number	Diff line number	Diff line
		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

+7 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -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

+3 −1

Original line number	Diff line number	Diff line
		@@ -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">