diff --git a/src/schedule-2.0/src/Controller/BreakdayController.php b/src/schedule-2.0/src/Controller/BreakdayController.php index 5880b9c..f019473 100755 --- a/src/schedule-2.0/src/Controller/BreakdayController.php +++ b/src/schedule-2.0/src/Controller/BreakdayController.php @@ -136,8 +136,15 @@ class BreakdayController extends AbstractController if($error) return $this->redirectToRoute($this->route."_update",["id"=>$id]); else { - $em->remove($data); - $em->flush(); + try { + $em->remove($data); + $em->flush(); + } + catch(\Doctrine\DBAL\DBALException $e) { + // Création du formulaire + $this->get('session')->getFlashBag()->add('error', 'Impossible de supprimer cet enregistrement'); + return $this->redirectToRoute($this->route."_update",["id"=>$id]); + } // Retour à la liste return $this->redirectToRoute($this->route); diff --git a/src/schedule-2.0/src/Controller/CustomerController.php b/src/schedule-2.0/src/Controller/CustomerController.php index b08bea5..74f990e 100755 --- a/src/schedule-2.0/src/Controller/CustomerController.php +++ b/src/schedule-2.0/src/Controller/CustomerController.php @@ -146,8 +146,15 @@ class CustomerController extends AbstractController if($error) return $this->redirectToRoute($this->route."_update",["id"=>$id]); else { - $em->remove($data); - $em->flush(); + try { + $em->remove($data); + $em->flush(); + } + catch(\Doctrine\DBAL\DBALException $e) { + // Création du formulaire + $this->get('session')->getFlashBag()->add('error', 'Impossible de supprimer cet enregistrement'); + return $this->redirectToRoute($this->route."_update",["id"=>$id]); + } // Retour à la liste return $this->redirectToRoute($this->route); diff --git a/src/schedule-2.0/src/Controller/JobController.php b/src/schedule-2.0/src/Controller/JobController.php index ba5f7c0..da1eca3 100755 --- a/src/schedule-2.0/src/Controller/JobController.php +++ b/src/schedule-2.0/src/Controller/JobController.php @@ -146,8 +146,15 @@ class JobController extends AbstractController if($error) return $this->redirectToRoute($this->route."_update",["id"=>$id]); else { - $em->remove($data); - $em->flush(); + try { + $em->remove($data); + $em->flush(); + } + catch(\Doctrine\DBAL\DBALException $e) { + // Création du formulaire + $this->get('session')->getFlashBag()->add('error', 'Impossible de supprimer cet enregistrement'); + return $this->redirectToRoute($this->route."_update",["id"=>$id]); + } // Retour à la liste return $this->redirectToRoute($this->route); diff --git a/src/schedule-2.0/src/Controller/NatureController.php b/src/schedule-2.0/src/Controller/NatureController.php index f4fa49b..f0f35eb 100755 --- a/src/schedule-2.0/src/Controller/NatureController.php +++ b/src/schedule-2.0/src/Controller/NatureController.php @@ -129,8 +129,15 @@ class NatureController extends AbstractController if($error) return $this->redirectToRoute($this->route."_update",["id"=>$id]); else { - $em->remove($data); - $em->flush(); + try { + $em->remove($data); + $em->flush(); + } + catch(\Doctrine\DBAL\DBALException $e) { + // Création du formulaire + $this->get('session')->getFlashBag()->add('error', 'Impossible de supprimer cet enregistrement'); + return $this->redirectToRoute($this->route."_update",["id"=>$id]); + } // Retour à la liste return $this->redirectToRoute($this->route); diff --git a/src/schedule-2.0/src/Controller/OfferController.php b/src/schedule-2.0/src/Controller/OfferController.php index 48d64a4..7ffc0b9 100755 --- a/src/schedule-2.0/src/Controller/OfferController.php +++ b/src/schedule-2.0/src/Controller/OfferController.php @@ -146,8 +146,15 @@ class OfferController extends AbstractController if($error) return $this->redirectToRoute($this->route."_update",["id"=>$id]); else { - $em->remove($data); - $em->flush(); + try { + $em->remove($data); + $em->flush(); + } + catch(\Doctrine\DBAL\DBALException $e) { + // Création du formulaire + $this->get('session')->getFlashBag()->add('error', 'Impossible de supprimer cet enregistrement'); + return $this->redirectToRoute($this->route."_update",["id"=>$id]); + } // Retour à la liste return $this->redirectToRoute($this->route); diff --git a/src/schedule-2.0/src/Controller/ProjectController.php b/src/schedule-2.0/src/Controller/ProjectController.php index 317161a..8912b98 100755 --- a/src/schedule-2.0/src/Controller/ProjectController.php +++ b/src/schedule-2.0/src/Controller/ProjectController.php @@ -150,8 +150,16 @@ class ProjectController extends AbstractController if($error) return $this->redirectToRoute($this->route."_update",["id"=>$id]); else { - $em->remove($data); - $em->flush(); + try { + $em->remove($data); + $em->flush(); + } + catch(\Doctrine\DBAL\DBALException $e) { + // Création du formulaire + $this->get('session')->getFlashBag()->add('error', 'Impossible de supprimer cet enregistrement'); + return $this->redirectToRoute($this->route."_update",["id"=>$id]); + } + $this->refreshsession(); // Retour à la liste diff --git a/src/schedule-2.0/src/Controller/SecurityController.php b/src/schedule-2.0/src/Controller/SecurityController.php index 0b98a22..3e221ed 100755 --- a/src/schedule-2.0/src/Controller/SecurityController.php +++ b/src/schedule-2.0/src/Controller/SecurityController.php @@ -61,6 +61,8 @@ class SecurityController extends AbstractController // Récupération Attribut $attributes = \phpCAS::getAttributes(); + dump($username); + dump($attributes); // Suppression des Attributs en tableaux foreach ($attributes as $key => $value) { @@ -97,7 +99,7 @@ class SecurityController extends AbstractController $user->setPassword("CASPWD-".$username); $user->setSalt("CASPWD-".$username); - $user->setRoles(["ROLE_USER"]); + $user->setRole("ROLE_USER"); $em->persist($user); $em->flush(); @@ -132,26 +134,14 @@ class SecurityController extends AbstractController public function logout() { - $auth_mode=$this->getParameter("appAuth"); - switch($auth_mode) { - case "MYSQL": - return $this->logoutMYSQL(); - break; - - case "CAS": - return $this->logoutCAS(); - break; - } - - } - - public function logoutMYSQL() { $this->get('security.token_storage')->setToken(null); $this->get('session')->invalidate(); - return $this->redirect($this->generateUrl("app_home")); + return $this->redirect($this->generateUrl("cnous_portal_homepage")); } + + public function logoutcas() { // Init Client CAS \phpCAS::setDebug('/var/www/html/schedule/var/log/cas.log'); @@ -162,7 +152,5 @@ class SecurityController extends AbstractController // Logout $url=$this->generateUrl('app_home', array(), UrlGeneratorInterface::ABSOLUTE_URL); \phpCAS::logout(array("service"=>$url)); - - return true; } } diff --git a/src/schedule-2.0/src/Controller/ServiceController.php b/src/schedule-2.0/src/Controller/ServiceController.php index 80c9229..dc61e53 100755 --- a/src/schedule-2.0/src/Controller/ServiceController.php +++ b/src/schedule-2.0/src/Controller/ServiceController.php @@ -146,8 +146,15 @@ class ServiceController extends AbstractController if($error) return $this->redirectToRoute($this->route."_update",["id"=>$id]); else { - $em->remove($data); - $em->flush(); + try { + $em->remove($data); + $em->flush(); + } + catch(\Doctrine\DBAL\DBALException $e) { + // Création du formulaire + $this->get('session')->getFlashBag()->add('error', 'Impossible de supprimer cet enregistrement'); + return $this->redirectToRoute($this->route."_update",["id"=>$id]); + } // Retour à la liste return $this->redirectToRoute($this->route); diff --git a/src/schedule-2.0/src/Controller/TaskController.php b/src/schedule-2.0/src/Controller/TaskController.php index 869d5c5..260bffa 100755 --- a/src/schedule-2.0/src/Controller/TaskController.php +++ b/src/schedule-2.0/src/Controller/TaskController.php @@ -146,8 +146,15 @@ class TaskController extends AbstractController if($error) return $this->redirectToRoute($this->route."_update",["id"=>$id]); else { - $em->remove($data); - $em->flush(); + try { + $em->remove($data); + $em->flush(); + } + catch(\Doctrine\DBAL\DBALException $e) { + // Création du formulaire + $this->get('session')->getFlashBag()->add('error', 'Impossible de supprimer cet enregistrement'); + return $this->redirectToRoute($this->route."_update",["id"=>$id]); + } // Retour à la liste return $this->redirectToRoute($this->route); diff --git a/src/schedule-2.0/src/Controller/UserController.php b/src/schedule-2.0/src/Controller/UserController.php index cbbcb4d..3071fbd 100755 --- a/src/schedule-2.0/src/Controller/UserController.php +++ b/src/schedule-2.0/src/Controller/UserController.php @@ -202,8 +202,16 @@ class UserController extends AbstractController if($error) return $this->redirectToRoute($this->route."_update",["id"=>$id]); else { - $em->remove($data); - $em->flush(); + try { + $em->remove($data); + $em->flush(); + } + catch(\Doctrine\DBAL\DBALException $e) { + // Création du formulaire + $this->get('session')->getFlashBag()->add('error', 'Impossible de supprimer cet enregistrement'); + return $this->redirectToRoute($this->route."_update",["id"=>$id]); + } + $this->refreshsession(); // Retour à la liste