Loading module/Application/config/others/structure.config.php +1 −1 Changes for module/Application/config/others/structure.config.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -46,7 +46,7 @@ return [ 'individu-role', 'generer-roles-defauts', ], 'privileges' => EtablissementPrivileges::ETABLISSEMENT_CONSULTATION, 'privileges' => StructurePrivileges::STRUCTURE_MODIFICATION_TOUTES_STRUCTURES, ], ], ], Loading module/Application/src/Application/Controller/StructureController.php +3 −3 Changes for module/Application/src/Application/Controller/StructureController.php: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -104,17 +104,17 @@ class StructureController extends AbstractController case TypeStructure::CODE_ECOLE_DOCTORALE : $ecole = $this->getEcoleDoctoraleService()->getRepository()->findByStructureId($id); $this->getRoleService()->addRoleByStructure($ecole); $this->redirect()->toRoute('ecole-doctorale/information', ['ecoleDoctorale' => $id], [], true); $this->redirect()->toRoute('ecole-doctorale/information', ['structure' => $id], [], true); break; case TypeStructure::CODE_UNITE_RECHERCHE : $unite = $this->getUniteRechercheService()->getRepository()->findByStructureId($id); $this->getRoleService()->addRoleByStructure($unite); $this->redirect()->toRoute('unite-recherche/information', ['uniteRecherche' => $id], [], true); $this->redirect()->toRoute('unite-recherche/information', ['structure' => $id], [], true); break; case TypeStructure::CODE_ETABLISSEMENT : $unite = $this->getEtablissementService()->getRepository()->findByStructureId($id); $this->getRoleService()->addRoleByStructure($unite); $this->redirect()->toRoute('etablissement/information', ['etablissement' => $id], [], true); $this->redirect()->toRoute('etablissement/information', ['structure' => $id], [], true); break; } } Loading module/Application/src/Application/Service/Role/RoleService.php +2 −2 Changes for module/Application/src/Application/Service/Role/RoleService.php: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -166,10 +166,10 @@ class RoleService extends BaseService $sourceCode = null; $roleId = null; if ($structure instanceof Etablissement) { $sourceCode = $this->getEtablissementPrefixFilter()->addPrefixEtablissementTo($roleModele->getRoleCode(), $structure); $sourceCode = $this->getEtablissementPrefixFilter()->addPrefixEtablissementTo($roleModele->getRoleCode()."_". $structure->getSourceCode(), $structure); $roleId = $roleModele->getLibelle()." ". $structure->getCode(); } else { $sourceCode = $this->getEtablissementPrefixFilter()->addPrefixEtablissementTo($roleModele->getRoleCode()); $sourceCode = $this->getEtablissementPrefixFilter()->addPrefixEtablissementTo($roleModele->getRoleCode()."_". $structure->getSourceCode()); $roleId = $roleModele->getLibelle()." ". $structure->getSourceCode(); } Loading Loading
module/Application/config/others/structure.config.php +1 −1 Changes for module/Application/config/others/structure.config.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -46,7 +46,7 @@ return [ 'individu-role', 'generer-roles-defauts', ], 'privileges' => EtablissementPrivileges::ETABLISSEMENT_CONSULTATION, 'privileges' => StructurePrivileges::STRUCTURE_MODIFICATION_TOUTES_STRUCTURES, ], ], ], Loading
module/Application/src/Application/Controller/StructureController.php +3 −3 Changes for module/Application/src/Application/Controller/StructureController.php: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -104,17 +104,17 @@ class StructureController extends AbstractController case TypeStructure::CODE_ECOLE_DOCTORALE : $ecole = $this->getEcoleDoctoraleService()->getRepository()->findByStructureId($id); $this->getRoleService()->addRoleByStructure($ecole); $this->redirect()->toRoute('ecole-doctorale/information', ['ecoleDoctorale' => $id], [], true); $this->redirect()->toRoute('ecole-doctorale/information', ['structure' => $id], [], true); break; case TypeStructure::CODE_UNITE_RECHERCHE : $unite = $this->getUniteRechercheService()->getRepository()->findByStructureId($id); $this->getRoleService()->addRoleByStructure($unite); $this->redirect()->toRoute('unite-recherche/information', ['uniteRecherche' => $id], [], true); $this->redirect()->toRoute('unite-recherche/information', ['structure' => $id], [], true); break; case TypeStructure::CODE_ETABLISSEMENT : $unite = $this->getEtablissementService()->getRepository()->findByStructureId($id); $this->getRoleService()->addRoleByStructure($unite); $this->redirect()->toRoute('etablissement/information', ['etablissement' => $id], [], true); $this->redirect()->toRoute('etablissement/information', ['structure' => $id], [], true); break; } } Loading
module/Application/src/Application/Service/Role/RoleService.php +2 −2 Changes for module/Application/src/Application/Service/Role/RoleService.php: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -166,10 +166,10 @@ class RoleService extends BaseService $sourceCode = null; $roleId = null; if ($structure instanceof Etablissement) { $sourceCode = $this->getEtablissementPrefixFilter()->addPrefixEtablissementTo($roleModele->getRoleCode(), $structure); $sourceCode = $this->getEtablissementPrefixFilter()->addPrefixEtablissementTo($roleModele->getRoleCode()."_". $structure->getSourceCode(), $structure); $roleId = $roleModele->getLibelle()." ". $structure->getCode(); } else { $sourceCode = $this->getEtablissementPrefixFilter()->addPrefixEtablissementTo($roleModele->getRoleCode()); $sourceCode = $this->getEtablissementPrefixFilter()->addPrefixEtablissementTo($roleModele->getRoleCode()."_". $structure->getSourceCode()); $roleId = $roleModele->getLibelle()." ". $structure->getSourceCode(); } Loading