From e36c195ecf7d8d744a5cc53c9cd53d96955c63f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 6 Jul 2015 00:10:13 +0200
Subject: [PATCH] add flashbag message for activity

---
 Controller/ActivityController.php      | 31 +++++++++++++++++++++++---
 Resources/translations/messages.fr.yml |  5 +++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/Controller/ActivityController.php b/Controller/ActivityController.php
index a99007a81..21e87264e 100644
--- a/Controller/ActivityController.php
+++ b/Controller/ActivityController.php
@@ -80,11 +80,24 @@ class ActivityController extends Controller
             
             $em->persist($entity);
             $em->flush();
+            
+            $this->get('session')
+                ->getFlashBag()
+                ->add('success', 
+                    $this->get('translator')
+                        ->trans('Success : activity created!')
+                );
 
             return $this->redirect(
                 $this->generateUrl('chill_activity_activity_show',
                 array('id' => $entity->getId(), 'person_id' => $person_id)));
         }
+        
+        $this->get('session')
+            ->getFlashBag()->add('danger',
+                $this->get('translator')
+                    ->trans('The form is not valid. The activity has not been created !')
+            );
 
         return $this->render('ChillActivityBundle:Activity:new.html.twig', array(
             'entity' => $entity,
@@ -231,8 +244,6 @@ class ActivityController extends Controller
             'role'   => new Role('CHILL_ACTIVITY_UPDATE')
         ));
 
-        $form->add('submit', 'submit', array('label' => 'Update'));
-
         return $form;
     }
     /**
@@ -258,9 +269,23 @@ class ActivityController extends Controller
 
         if ($editForm->isValid()) {
             $em->flush();
+            
+            $this->get('session')
+                ->getFlashBag()
+                ->add('success', 
+                    $this->get('translator')
+                        ->trans('Success : activity updated!')
+                );
 
-            return $this->redirect($this->generateUrl('chill_activity_activity_edit', array('id' => $id, 'person_id' => $person_id)));
+            return $this->redirect($this->generateUrl('chill_activity_activity_show', array('id' => $id, 'person_id' => $person_id)));
         }
+        
+        $this->get('session')
+            ->getFlashBag()
+            ->add('danger',
+                $this->get('translator')
+                    ->trans('The form is not valid. The activity has not been updated !')
+            );
 
         return $this->render('ChillActivityBundle:Activity:edit.html.twig', array(
             'entity'      => $entity,
diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index 90950fbf7..82172eca1 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -26,4 +26,9 @@ Reset form: Remise à zéro du formulaire
 #timeline
 '%user% has done an %activity_type% on %date%': %user% a effectué une activité de type "%activity_type%" le %date%
 
+#controller
+'Success : activity created!': Bravo ! L'activité a été créée.
+'The form is not valid. The activity has not been created !': Le formulaire est invalide. L'activité n'a pas été créée.
+'Success : activity updated!': Bravo ! L'activité a été mise à jour.
+'The form is not valid. The activity has not been updated !': Le formulaire est invalide. L'activité n'a pas été mise à jour.