Fusion avec CreationRoleAuto (76dd9a17) · Commits · open-source / sygal

module/Application/src/Application/Controller/EcoleDoctoraleController.php

+7 −0

Changes for module/Application/src/Application/Controller/EcoleDoctoraleController.php: 7 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -120,6 +120,10 @@ class EcoleDoctoraleController extends AbstractController
		return $viewModel;
		}

		/**
		* @return \Zend\Http\Response\|ViewModel
		* @throws \Doctrine\ORM\OptimisticLockException
		*/
		public function ajouterAction()
		{
		if ($data = $this->params()->fromPost()) {
		@@ -140,6 +144,9 @@ class EcoleDoctoraleController extends AbstractController
		$this->ajouterLogoEcoleDoctorale($file['cheminLogo']['tmp_name'], $ecole);
		}

		//creation automatique des roles associés à une unité de recherche
		$this->roleService->addRoleByStructure($ecole);

		$this->flashMessenger()->addSuccessMessage("École doctorale '$ecole' créée avec succès");

		return $this->redirect()->toRoute('ecole-doctorale', [], ['query' => ['selected' => $ecole->getId()]], true);

+7 −0

Changes for module/Application/src/Application/Controller/EtablissementController.php: 7 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -93,6 +93,10 @@ class EtablissementController extends AbstractController
		]);
		}

		/**
		* @return \Zend\Http\Response\|ViewModel
		* @throws \Doctrine\ORM\OptimisticLockException
		*/
		public function ajouterAction()
		{
		if ($data = $this->params()->fromPost()) {
		@@ -112,6 +116,9 @@ class EtablissementController extends AbstractController
		$this->ajouterLogoEtablissement($file['cheminLogo']['tmp_name'], $etablissement);
		}

		//creation automatique des roles associés à une unité de recherche
		$this->roleService->addRoleByStructure($etablissement);

		$this->flashMessenger()->addSuccessMessage("Établissement '$etablissement' créée avec succès");

		return $this->redirect()->toRoute('etablissement', [], ['query' => ['selected' => $etablissement->getId()]], true);

+9 −0

Changes for module/Application/src/Application/Controller/UniteRechercheController.php: 9 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -4,6 +4,8 @@ namespace Application\Controller;

		use Application\Entity\Db\IndividuRole;
		use Application\Entity\Db\Role;
		use Application\Entity\Db\RoleModele;
		use Application\Entity\Db\TypeStructure;
		use Application\Entity\Db\UniteRecherche;
		use Application\Entity\UserWrapper;
		use Application\Form\UniteRechercheForm;
		@@ -121,6 +123,10 @@ class UniteRechercheController extends AbstractController
		return $viewModel;
		}

		/**
		* @return \Zend\Http\Response\|ViewModel
		* @throws \Doctrine\ORM\OptimisticLockException
		*/
		public function ajouterAction()
		{
		if ($data = $this->params()->fromPost()) {
		@@ -140,6 +146,9 @@ class UniteRechercheController extends AbstractController
		$this->ajouterLogoUniteRecherche($file['cheminLogo']['tmp_name'], $unite);
		}

		//creation automatique des roles associés à une unité de recherche
		$this->roleService->addRoleByStructure($unite);

		$this->flashMessenger()->addSuccessMessage("Unité de recherche '$unite' créée avec succès");

		return $this->redirect()->toRoute('unite-recherche', [], ['query' => ['selected' => $unite->getId()]], true);

+15 −0

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Role.dcm.xml: 15 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -39,5 +39,20 @@
		</join-columns>
		</many-to-one>

		<many-to-one field="histoModificateur" target-entity="Application\Entity\Db\Utilisateur">
		<join-columns>
		<join-column name="HISTO_MODIFICATEUR_ID" referenced-column-name="ID"/>
		</join-columns>
		</many-to-one>
		<many-to-one field="histoDestructeur" target-entity="Application\Entity\Db\Utilisateur">
		<join-columns>
		<join-column name="HISTO_DESTRUCTEUR_ID" referenced-column-name="ID"/>
		</join-columns>
		</many-to-one>
		<many-to-one field="histoCreateur" target-entity="Application\Entity\Db\Utilisateur">
		<join-columns>
		<join-column name="HISTO_CREATEUR_ID" referenced-column-name="ID"/>
		</join-columns>
		</many-to-one>
		</entity>
		</doctrine-mapping>

0 → 100644

+20 −0

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.RoleModele.dcm.xml: 20 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
		xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
		<entity name="Application\Entity\Db\RoleModele" table="ROLE_MODELE">
		<!--repository-class="Application\Entity\Db\Repository\RoleRepository">-->
		<id name="id" type="integer" column="ID">
		</id>

		<field name="libelle" type="string" column="LIBELLE" length="100" nullable="false"/>
		<field name="roleCode" type="string" column="ROLE_ID" length="64" nullable="false"/>

		<many-to-one field="structureType" target-entity="Application\Entity\Db\TypeStructure">
		<join-columns>
		<join-column name="STRUCTURE_TYPE" referenced-column-name="ID"/>
		</join-columns>
		</many-to-one>

		</entity>
		</doctrine-mapping>