Merge remote-tracking branch 'origin/master'

This commit is contained in:
Julien Fastré 2016-03-24 14:19:09 +01:00
commit 75266361b2
2 changed files with 3 additions and 2 deletions

View File

@ -49,7 +49,7 @@ class EventController extends Controller
$em->persist($entity); $em->persist($entity);
$em->flush(); $em->flush();
return $this->redirect($this->generateUrl('event_show', array('id' => $entity->getId()))); return $this->redirect($this->generateUrl('event_show', array('event_id' => $entity->getId())));
} }
return $this->render('ChillEventBundle:Event:new.html.twig', array( return $this->render('ChillEventBundle:Event:new.html.twig', array(

View File

@ -80,8 +80,10 @@ class EventType extends AbstractType
->add('center', EntityType::class, array( ->add('center', EntityType::class, array(
'class' => Center::class, 'class' => Center::class,
'choices' => $userReachableCenters, 'choices' => $userReachableCenters,
'attr' => array('class' => 'select2 chill-category-link-parent'),
'choice_attr' => function (Center $center) { 'choice_attr' => function (Center $center) {
return array( return array(
'class' => ' chill-category-link-parent',
'data-link-category' => $center->getId() 'data-link-category' => $center->getId()
); );
}, },
@ -96,7 +98,6 @@ class EventType extends AbstractType
'choice_attr' => function ($circle) use ($userReachableCentersByCircleId) { 'choice_attr' => function ($circle) use ($userReachableCentersByCircleId) {
$centersId = ""; $centersId = "";
foreach ($userReachableCentersByCircleId[$circle->getId()] as $center) { foreach ($userReachableCentersByCircleId[$circle->getId()] as $center) {
print $center;
$centersId = $centersId.($center->getId()).','; $centersId = $centersId.($center->getId()).',';
} }
$centersId = trim($centersId, ','); $centersId = trim($centersId, ',');