From a8b26866718f8bff3f1e553336ec46585b4feed3 Mon Sep 17 00:00:00 2001 From: stoakes Date: Thu, 18 Jan 2018 20:04:23 +0100 Subject: [PATCH] Fix copy/paste issue in EtudeController --- .../SuiviBundle/Controller/EtudeController.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Mgate/SuiviBundle/Controller/EtudeController.php b/src/Mgate/SuiviBundle/Controller/EtudeController.php index 027bdbb82..cb481499a 100644 --- a/src/Mgate/SuiviBundle/Controller/EtudeController.php +++ b/src/Mgate/SuiviBundle/Controller/EtudeController.php @@ -166,7 +166,7 @@ public function addAction(Request $request) if ($form->isValid()) { if ((!$etude->isKnownProspect() && !$etude->getNewProspect()) || !$etude->getProspect()) { - $this->addFlash('danger', 'Définir un prospect'); + $this->addFlash('danger', 'Vous devez définir un prospect'); return $this->render('MgateSuiviBundle:Etude:ajouter.html.twig', ['form' => $form->createView()]); } elseif (!$etude->isKnownProspect()) { @@ -175,7 +175,7 @@ public function addAction(Request $request) $em->persist($etude); $em->flush(); - $this->addFlash('success', 'Etude enregistrée'); + $this->addFlash('success', 'Etude ajoutée'); if ($request->get('ap')) { return $this->redirectToRoute('MgateSuivi_ap_rediger', ['id' => $etude->getId()]); @@ -247,16 +247,20 @@ public function modifierAction(Request $request, Etude $etude) if ($form->isValid()) { if ((!$etude->isKnownProspect() && !$etude->getNewProspect()) || !$etude->getProspect()) { - $this->addFlash('danger', 'Définir un prospect'); + $this->addFlash('danger', 'Vous devez définir un prospect'); - return $this->render('MgateSuiviBundle:Etude:ajouter.html.twig', ['form' => $form->createView()]); + return $this->render('MgateSuiviBundle:Etude:modifier.html.twig', [ + 'form' => $form->createView(), + 'etude' => $etude, + 'delete_form' => $deleteForm->createView(), + ]); } elseif (!$etude->isKnownProspect()) { $etude->setProspect($etude->getNewProspect()); } $em->persist($etude); $em->flush(); - $this->addFlash('success', 'Etude enregistrée'); + $this->addFlash('success', 'Etude modifiée'); if ($request->get('ap')) { return $this->redirectToRoute('MgateSuivi_ap_rediger', ['id' => $etude->getId()]);