From 88510942e586addc4d78b28e5ff610b643321a05 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Wed, 12 Nov 2014 12:49:02 +0100 Subject: [PATCH] choice of user in form --- Controller/ReportController.php | 4 +--- Form/ReportType.php | 7 +++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Controller/ReportController.php b/Controller/ReportController.php index 8d505eecf..29768a128 100644 --- a/Controller/ReportController.php +++ b/Controller/ReportController.php @@ -106,6 +106,7 @@ class ReportController extends Controller $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id); $entity = new Report(); + $entity->setUser($this->get('security.context')->getToken()->getUser()); $cFGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($cf_group_id); $entity->setCFGroup($cFGroup); @@ -139,9 +140,6 @@ class ReportController extends Controller $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id); $entity->setPerson($person); - - $user = $this->get('security.context')->getToken()->getUser(); - $entity->setUser($user); $em->persist($entity); $em->flush(); diff --git a/Form/ReportType.php b/Form/ReportType.php index c253e416e..4ee34a48f 100644 --- a/Form/ReportType.php +++ b/Form/ReportType.php @@ -36,9 +36,12 @@ class ReportType extends AbstractType $entityManager = $options['em']; $builder - ->add('date', 'date', array('required' => false, 'widget' => 'single_text', 'format' => 'dd-MM-yyyy')) + ->add('user') + ->add('date', 'date', + array('required' => false, 'widget' => 'single_text', 'format' => 'dd-MM-yyyy')) ->add('scope') - ->add('cFData', 'custom_field', array('attr' => array('class' => 'only-label'), 'group' => $options['cFGroup'])) + ->add('cFData', 'custom_field', + array('attr' => array('class' => 'only-label'), 'group' => $options['cFGroup'])) ; }