jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added more entity actions (#757)

Browse Source
This commit is contained in:
Björn Weinbrenner
2019-05-10 02:10:37 +02:00
committed by Kevin Papst
parent b1855447b8
commit e619b5fd31
8 changed files with 106 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Controller/ActivityController.php
View File

@@ -10,6 +10,7 @@
namespace App\Controller;
use App\Entity\Activity;
use App\Entity\Project;
use App\Form\ActivityEditForm;
use App\Form\Toolbar\ActivityToolbarForm;
use App\Form\Type\ActivityType;
@@ -75,14 +76,21 @@ class ActivityController extends AbstractController
/**
* @Route(path="/create", name="admin_activity_create", methods={"GET", "POST"})
* @Route(path="/create/{project}", name="admin_activity_create_with_project", methods={"GET", "POST"})
* @Security("is_granted('create_activity')")
*
* @param Request $request
* @param Project|null $project
* @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
*/
public function createAction(Request $request)
public function createAction(Request $request, ?Project $project = null)
{
return $this->renderActivityForm(new Activity(), $request);
$activity = new Activity();
if (null !== $project) {
$activity->setProject($project);
}
return $this->renderActivityForm($activity, $request);
}
/**