diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql index 7b065970..11341265 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql @@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES (-100, 'DRAAF', '130007107'); INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES -(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}lfWLOzsWTTGkrbaPndkzPSiFKH078TmD +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}9tH17tlC86xamslwYLnhF4qiMaQqvbuL ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php index b9a15619..2176e20e 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php @@ -31,6 +31,7 @@ class GroupController extends Controller private $labelentity = 'CadolesCoreBundle:Group'; private $labeldata = 'group'; private $labeldatas = 'groups'; + private $idpage; public function listAction($access) { @@ -756,7 +757,7 @@ class GroupController extends Controller $this->ctrlFgcanshare($data,$access); // Retour à la liste - return $this->redirectToRoute("cadoles_core_".$access."_group_users",["id"=>$data->getId()]); + return $this->redirectToRoute("cadoles_core_".$access."_group_users",["id"=>$data->getId(),"idreturn"=>$this->idpage]); } // Affichage du formulaire @@ -1097,8 +1098,11 @@ class GroupController extends Controller $em->persist($page); $em->persist($group); - $em->flush(); + $em->flush(); + } + $pages=$group->getPages(); + $this->idpage=$pages[0]->getId(); // On regarde s'il a au moins un calendrier if($group->getCalendars()->isEmpty()) {