Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-01 20:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

mergin conflict

Browse Source
This commit is contained in:
Marc Ducobu
2015-07-03 09:48:39 +02:00
parent faffdee1ab be78c25091
commit a0798c014e
3 changed files with 101 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Controller/ActivityController.php
View File

@@ -27,6 +27,8 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Chill\ActivityBundle\Entity\Activity;
use Chill\ActivityBundle\Form\ActivityType;
use Symfony\Component\Security\Core\Role\Role;
use Chill\PersonBundle\Entity\Person;
/**
* Activity controller.
@@ -59,6 +61,12 @@ class ActivityController extends Controller
$em = $this->getDoctrine()->getManager();
$person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
/**if ($person === NULL) {
throw $this->createNotFoundException('person not found');
}*/
$this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
$entity = new Activity();
$form = $this->createCreateForm($entity, $person);
$form->handleRequest($request);
@@ -87,12 +95,16 @@ class ActivityController extends Controller
*
* @return \Symfony\Component\Form\Form The form
*/
private function createCreateForm(Activity $entity, $person)
private function createCreateForm(Activity $entity, Person $person)
{
$form = $this->createForm(new ActivityType(), $entity, array(
'action' => $this->generateUrl('chill_activity_activity_create', ['person_id' => $person->getId()]),
'method' => 'POST',
));
$form = $this->createForm('chill_activitybundle_activity', $entity,
array(
'action' => $this->generateUrl('chill_activity_activity_create', ['person_id' => $person->getId()]),
'method' => 'POST',
'center' => $person->getCenter(),
'role' => new Role('CHILL_ACTIVITY_CREATE')
)
);
$form->add('submit', 'submit', array('label' => 'Create'));