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

Added "create activity" form (#35)

Browse Source 
* added create activity form #24
* fixed form type for Projects
* UI improvement toolbar (same height as ll form elements and action buttons)
This commit is contained in:
Kevin Papst
2018-01-06 11:53:15 +01:00
committed by GitHub
parent f6ab543b8d
commit 3270ce7560
6 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/TimesheetBundle/Controller/Admin/ActivityController.php
View File

@@ -47,11 +47,30 @@ class ActivityController extends AbstractController
return $this->render('TimesheetBundle:admin:activity.html.twig', ['entries' => $entries]);
}
/**
* @Route("/create", name="admin_activity_create")
* @Method({"GET", "POST"})
*/
public function createAction(Request $request)
{
return $this->renderActivityForm(new Activity(), $request);
}
/**
* @Route("/{id}/edit", name="admin_activity_edit")
* @Method({"GET", "POST"})
*/
public function editAction(Activity $activity, Request $request)
{
return $this->renderActivityForm($activity, $request);
}
/**
* @param Activity $activity
* @param Request $request
* @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
*/
protected function renderActivityForm(Activity $activity, Request $request)
{
$editForm = $this->createEditForm($activity);
@@ -84,11 +103,17 @@ class ActivityController extends AbstractController
*/
private function createEditForm(Activity $activity)
{
if ($activity->getId() === null) {
$url = $this->generateUrl('admin_activity_create');
} else {
$url = $this->generateUrl('admin_activity_edit', ['id' => $activity->getId()]);
}
return $this->createForm(
ActivityEditForm::class,
$activity,
[
'action' => $this->generateUrl('admin_activity_edit', ['id' => $activity->getId()]),
'action' => $url,
'method' => 'POST'
]
);