Loading data/db/oracle-data-insert-from-SYGAL_TEST.ROLE_MODELE-into-SYGAL_TEST.sql +5 −5 Changes for data/db/oracle-data-insert-from-SYGAL_TEST.ROLE_MODELE-into-SYGAL_TEST.sql: 5 added lines, 5 removed lines. Original line number Diff line number Diff line set define off ; INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (1, 'Unité de recherche', 'UR', 3) ; INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (2, 'École doctorale', 'ED', 2) ; INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (3, 'Administrateur', 'ADMIN', 1) ; INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (4, 'Bureau des doctorats', 'BDD', 1) ; INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (5, 'Bibliothèque universitaire', 'BU', 1) ; INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (1, 'Unité de recherche', 'UR', 3) ; INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (2, 'École doctorale', 'ED', 2) ; INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (3, 'Administrateur', 'ADMIN', 1) ; INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (4, 'Bureau des doctorats', 'BDD', 1) ; INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (5, 'Bibliothèque universitaire', 'BU', 1) ; data/db/oracle-generate-schema-SYGAL_TEST-from-SYGAL_TEST.sql +1 −1 Changes for data/db/oracle-generate-schema-SYGAL_TEST-from-SYGAL_TEST.sql: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -4562,7 +4562,7 @@ WHERE i.TYPE='doctorant' AND t.ETAT_THESE = 'E' AND i.EMAIL is NULL; REFERENCES "SYGAL_TEST"."STRUCTURE" ("ID") ON DELETE CASCADE ENABLE; ALTER TABLE "SYGAL_TEST"."ETABLISSEMENT" ADD CONSTRAINT "ETAB_STRUCT_FK" FOREIGN KEY ("STRUCTURE_ID") REFERENCES "SYGAL_TEST"."STRUCTURE" ("ID") ON DELETE CASCADE ENABLE; ALTER TABLE "SYGAL_TEST"."ROLE_MODELE" ADD CONSTRAINT "ROLEMODELE_STRUCTURETYPE_FK" FOREIGN KEY ("STRUCTURE_TYPE") ALTER TABLE "SYGAL_TEST".PROFIL ADD CONSTRAINT "ROLEMODELE_STRUCTURETYPE_FK" FOREIGN KEY ("STRUCTURE_TYPE") REFERENCES "SYGAL_TEST"."TYPE_STRUCTURE" ("ID") ENABLE; ALTER TABLE "SYGAL_TEST"."ROLE" ADD CONSTRAINT "ROLE_TYPE_STRUCT_ID_FK" FOREIGN KEY ("TYPE_STRUCTURE_DEPENDANT_ID") REFERENCES "SYGAL_TEST"."TYPE_STRUCTURE" ("ID") ON DELETE CASCADE ENABLE; Loading module/Application/config/others/admin.config.php +28 −0 Changes for module/Application/config/others/admin.config.php: 28 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -4,6 +4,10 @@ use Application\Controller\AdminController; use Application\Controller\Factory\RoleControllerFactory; use Application\Controller\MailConfirmationController; use Application\Controller\RoleController; use Application\Form\Factory\ProfilFormFactory; use Application\Form\Factory\ProfilHydratorFactory; use Application\Form\Hydrator\ProfilHydrator; use Application\Form\ProfilForm; use Application\Provider\Privilege\StructurePrivileges; use Application\Provider\Privilege\UniteRecherchePrivileges; use Application\Provider\Privilege\UtilisateurPrivileges; Loading Loading @@ -54,6 +58,15 @@ return [ Privileges::DROIT_PRIVILEGE_EDITION, ], ], [ 'controller' => \Application\Controller\PrivilegeController::class, 'action' => [ 'editer-profil', ], 'privileges' => [ Privileges::DROIT_PRIVILEGE_EDITION, ], ], [ 'controller' => \Application\Controller\PrivilegeController::class, 'action' => [ Loading Loading @@ -125,6 +138,19 @@ return [ 'action' => 'role-modele-index', ], ], 'may_terminate' => true, 'child_routes' => [ 'editer' => [ 'type' => Segment::class, 'options' => [ 'route' => '/editer[/:profil]', 'defaults' => [ 'controller' => \Application\Controller\PrivilegeController::class, 'action' => 'editer-profil', ], ], ], ], ], 'role-ordre' => [ 'type' => Literal::class, Loading Loading @@ -290,11 +316,13 @@ return [ ], 'factories' => [ 'MailConfirmationForm' => MailConfirmationFormFactory::class, ProfilForm::class => ProfilFormFactory::class, ], ], 'hydrators' => [ 'factories' => [ 'MailConfirmationHydrator' => MailConfirmationHydratorFactory::class, ProfilHydrator::class => ProfilHydratorFactory::class, ] ], Loading module/Application/src/Application/Controller/PrivilegeController.php +39 −6 Changes for module/Application/src/Application/Controller/PrivilegeController.php: 39 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -4,7 +4,8 @@ namespace Application\Controller; use Application\Entity\Db\Privilege; use Application\Entity\Db\Role; use Application\Entity\Db\RoleModele; use Application\Entity\Db\Profil; use Application\Form\ProfilForm; use Application\Service\Etablissement\EtablissementServiceAwareTrait; use Application\Service\Role\RoleServiceAwareTrait; use Application\Service\Structure\StructureServiceAwareTrait; Loading @@ -12,6 +13,7 @@ use Doctrine\ORM\QueryBuilder; use UnicaenApp\Service\EntityManagerAwareTrait; use UnicaenAuth\Entity\Db\CategoriePrivilege; use UnicaenAuth\Service\Traits\PrivilegeServiceAwareTrait; use Zend\Http\Request; use Zend\View\Model\JsonModel; use Zend\View\Model\ViewModel; Loading Loading @@ -87,18 +89,18 @@ class PrivilegeController extends AbstractController $role_id = $this->params()->fromRoute("role"); /** * @var RoleModele $role * @var Profil $role * @var Privilege $privilege */ $role = $this->entityManager->getRepository(RoleModele::class)->find($role_id); $role = $this->entityManager->getRepository(Profil::class)->find($role_id); $privilege = $this->entityManager->getRepository(Privilege::class)->find($privilege_id); $value = null; if( $role->hasPrivilege($privilege)) { $privilege->removeRoleModele($role); $privilege->removeProfil($role); $value = 0; } else { $privilege->addRoleModele($role); $privilege->addProfil($role); $value = 1; } // $this->entityManager->flush($role); Loading Loading @@ -152,7 +154,7 @@ class PrivilegeController extends AbstractController public function roleModeleIndexAction() { $modeles = $this->getRoleService()->getRolesModeles(); $modeles = $this->getRoleService()->getProfils(); //$privileges = $this->getServicePrivilege()->getRepo()->findAll(); $qb_categorie = $this->entityManager->getRepository(Privilege::class)->createQueryBuilder("p"); Loading @@ -165,4 +167,35 @@ class PrivilegeController extends AbstractController 'privileges' => $privileges, ]); } public function editerProfilAction() { /** @var Profil $profil */ $profilId = $this->params()->fromRoute('profil'); $profil = null; if($profilId) $profil = $this->getRoleService()->getProfil($profilId); else $profil = new Profil(); /** @var ProfilForm $form */ $form = $this->getServiceLocator()->get('FormElementManager')->get(ProfilForm::class); $form->bind($profil); /** @var Request $request */ $request = $this->getRequest(); if ($request->isPost()) { $data = $request->getPost(); $form->setData($data); if ($form->isValid()) { if ($profilId) $this->getRoleService()->updateProfil($profil); else $this->getRoleService()->createProfil($profil); $this->redirect()->toRoute('admin/gestion-role-modele', [], [], true); } } return new ViewModel([ 'form' => $form, ]); } } No newline at end of file module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Privilege.dcm.xml +1 −1 Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Privilege.dcm.xml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -30,7 +30,7 @@ </join-table> </many-to-many> <many-to-many target-entity="Application\Entity\Db\RoleModele" field="modeles"> <many-to-many target-entity="Application\Entity\Db\Profil" field="modeles"> <join-table name="ROLE_PRIVILEGE_MODELE"> <join-columns> <join-column name="PRIVILEGE_ID" referenced-column-name="ID"/> Loading Loading
data/db/oracle-data-insert-from-SYGAL_TEST.ROLE_MODELE-into-SYGAL_TEST.sql +5 −5 Changes for data/db/oracle-data-insert-from-SYGAL_TEST.ROLE_MODELE-into-SYGAL_TEST.sql: 5 added lines, 5 removed lines. Original line number Diff line number Diff line set define off ; INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (1, 'Unité de recherche', 'UR', 3) ; INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (2, 'École doctorale', 'ED', 2) ; INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (3, 'Administrateur', 'ADMIN', 1) ; INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (4, 'Bureau des doctorats', 'BDD', 1) ; INSERT INTO SYGAL_TEST.ROLE_MODELE (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (5, 'Bibliothèque universitaire', 'BU', 1) ; INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (1, 'Unité de recherche', 'UR', 3) ; INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (2, 'École doctorale', 'ED', 2) ; INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (3, 'Administrateur', 'ADMIN', 1) ; INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (4, 'Bureau des doctorats', 'BDD', 1) ; INSERT INTO SYGAL_TEST.PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE) VALUES (5, 'Bibliothèque universitaire', 'BU', 1) ;
data/db/oracle-generate-schema-SYGAL_TEST-from-SYGAL_TEST.sql +1 −1 Changes for data/db/oracle-generate-schema-SYGAL_TEST-from-SYGAL_TEST.sql: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -4562,7 +4562,7 @@ WHERE i.TYPE='doctorant' AND t.ETAT_THESE = 'E' AND i.EMAIL is NULL; REFERENCES "SYGAL_TEST"."STRUCTURE" ("ID") ON DELETE CASCADE ENABLE; ALTER TABLE "SYGAL_TEST"."ETABLISSEMENT" ADD CONSTRAINT "ETAB_STRUCT_FK" FOREIGN KEY ("STRUCTURE_ID") REFERENCES "SYGAL_TEST"."STRUCTURE" ("ID") ON DELETE CASCADE ENABLE; ALTER TABLE "SYGAL_TEST"."ROLE_MODELE" ADD CONSTRAINT "ROLEMODELE_STRUCTURETYPE_FK" FOREIGN KEY ("STRUCTURE_TYPE") ALTER TABLE "SYGAL_TEST".PROFIL ADD CONSTRAINT "ROLEMODELE_STRUCTURETYPE_FK" FOREIGN KEY ("STRUCTURE_TYPE") REFERENCES "SYGAL_TEST"."TYPE_STRUCTURE" ("ID") ENABLE; ALTER TABLE "SYGAL_TEST"."ROLE" ADD CONSTRAINT "ROLE_TYPE_STRUCT_ID_FK" FOREIGN KEY ("TYPE_STRUCTURE_DEPENDANT_ID") REFERENCES "SYGAL_TEST"."TYPE_STRUCTURE" ("ID") ON DELETE CASCADE ENABLE; Loading
module/Application/config/others/admin.config.php +28 −0 Changes for module/Application/config/others/admin.config.php: 28 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -4,6 +4,10 @@ use Application\Controller\AdminController; use Application\Controller\Factory\RoleControllerFactory; use Application\Controller\MailConfirmationController; use Application\Controller\RoleController; use Application\Form\Factory\ProfilFormFactory; use Application\Form\Factory\ProfilHydratorFactory; use Application\Form\Hydrator\ProfilHydrator; use Application\Form\ProfilForm; use Application\Provider\Privilege\StructurePrivileges; use Application\Provider\Privilege\UniteRecherchePrivileges; use Application\Provider\Privilege\UtilisateurPrivileges; Loading Loading @@ -54,6 +58,15 @@ return [ Privileges::DROIT_PRIVILEGE_EDITION, ], ], [ 'controller' => \Application\Controller\PrivilegeController::class, 'action' => [ 'editer-profil', ], 'privileges' => [ Privileges::DROIT_PRIVILEGE_EDITION, ], ], [ 'controller' => \Application\Controller\PrivilegeController::class, 'action' => [ Loading Loading @@ -125,6 +138,19 @@ return [ 'action' => 'role-modele-index', ], ], 'may_terminate' => true, 'child_routes' => [ 'editer' => [ 'type' => Segment::class, 'options' => [ 'route' => '/editer[/:profil]', 'defaults' => [ 'controller' => \Application\Controller\PrivilegeController::class, 'action' => 'editer-profil', ], ], ], ], ], 'role-ordre' => [ 'type' => Literal::class, Loading Loading @@ -290,11 +316,13 @@ return [ ], 'factories' => [ 'MailConfirmationForm' => MailConfirmationFormFactory::class, ProfilForm::class => ProfilFormFactory::class, ], ], 'hydrators' => [ 'factories' => [ 'MailConfirmationHydrator' => MailConfirmationHydratorFactory::class, ProfilHydrator::class => ProfilHydratorFactory::class, ] ], Loading
module/Application/src/Application/Controller/PrivilegeController.php +39 −6 Changes for module/Application/src/Application/Controller/PrivilegeController.php: 39 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -4,7 +4,8 @@ namespace Application\Controller; use Application\Entity\Db\Privilege; use Application\Entity\Db\Role; use Application\Entity\Db\RoleModele; use Application\Entity\Db\Profil; use Application\Form\ProfilForm; use Application\Service\Etablissement\EtablissementServiceAwareTrait; use Application\Service\Role\RoleServiceAwareTrait; use Application\Service\Structure\StructureServiceAwareTrait; Loading @@ -12,6 +13,7 @@ use Doctrine\ORM\QueryBuilder; use UnicaenApp\Service\EntityManagerAwareTrait; use UnicaenAuth\Entity\Db\CategoriePrivilege; use UnicaenAuth\Service\Traits\PrivilegeServiceAwareTrait; use Zend\Http\Request; use Zend\View\Model\JsonModel; use Zend\View\Model\ViewModel; Loading Loading @@ -87,18 +89,18 @@ class PrivilegeController extends AbstractController $role_id = $this->params()->fromRoute("role"); /** * @var RoleModele $role * @var Profil $role * @var Privilege $privilege */ $role = $this->entityManager->getRepository(RoleModele::class)->find($role_id); $role = $this->entityManager->getRepository(Profil::class)->find($role_id); $privilege = $this->entityManager->getRepository(Privilege::class)->find($privilege_id); $value = null; if( $role->hasPrivilege($privilege)) { $privilege->removeRoleModele($role); $privilege->removeProfil($role); $value = 0; } else { $privilege->addRoleModele($role); $privilege->addProfil($role); $value = 1; } // $this->entityManager->flush($role); Loading Loading @@ -152,7 +154,7 @@ class PrivilegeController extends AbstractController public function roleModeleIndexAction() { $modeles = $this->getRoleService()->getRolesModeles(); $modeles = $this->getRoleService()->getProfils(); //$privileges = $this->getServicePrivilege()->getRepo()->findAll(); $qb_categorie = $this->entityManager->getRepository(Privilege::class)->createQueryBuilder("p"); Loading @@ -165,4 +167,35 @@ class PrivilegeController extends AbstractController 'privileges' => $privileges, ]); } public function editerProfilAction() { /** @var Profil $profil */ $profilId = $this->params()->fromRoute('profil'); $profil = null; if($profilId) $profil = $this->getRoleService()->getProfil($profilId); else $profil = new Profil(); /** @var ProfilForm $form */ $form = $this->getServiceLocator()->get('FormElementManager')->get(ProfilForm::class); $form->bind($profil); /** @var Request $request */ $request = $this->getRequest(); if ($request->isPost()) { $data = $request->getPost(); $form->setData($data); if ($form->isValid()) { if ($profilId) $this->getRoleService()->updateProfil($profil); else $this->getRoleService()->createProfil($profil); $this->redirect()->toRoute('admin/gestion-role-modele', [], [], true); } } return new ViewModel([ 'form' => $form, ]); } } No newline at end of file
module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Privilege.dcm.xml +1 −1 Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Privilege.dcm.xml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -30,7 +30,7 @@ </join-table> </many-to-many> <many-to-many target-entity="Application\Entity\Db\RoleModele" field="modeles"> <many-to-many target-entity="Application\Entity\Db\Profil" field="modeles"> <join-table name="ROLE_PRIVILEGE_MODELE"> <join-columns> <join-column name="PRIVILEGE_ID" referenced-column-name="ID"/> Loading