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

open create form for activity/project/customer in modals (#2025)

Browse Source
This commit is contained in:
Kevin Papst
2020-10-08 01:12:34 +02:00
committed by GitHub
parent 46bf01d93e
commit fb31319fcf
17 changed files with 60 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/Controller/ActivityController.php
View File

@@ -35,9 +35,7 @@ use Pagerfanta\Pagerfanta;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
/**
@@ -192,7 +190,27 @@ final class ActivityController extends AbstractController
$activity->setProject($project);
}
return $this->renderActivityForm($activity, $request);
$event = new ActivityMetaDefinitionEvent($activity);
$this->dispatcher->dispatch($event);
$editForm = $this->createEditForm($activity);
$editForm->handleRequest($request);
if ($editForm->isSubmitted() && $editForm->isValid()) {
try {
$this->repository->saveActivity($activity);
$this->flashSuccess('action.update.success');
return $this->redirectToRoute('admin_activity');
} catch (Exception $ex) {
$this->flashUpdateException($ex);
}
}
return $this->render('activity/edit.html.twig', [
'activity' => $activity,
'form' => $editForm->createView()
]);
}
/**
@@ -258,7 +276,27 @@ final class ActivityController extends AbstractController
*/
public function editAction(Activity $activity, Request $request)
{
return $this->renderActivityForm($activity, $request);
$event = new ActivityMetaDefinitionEvent($activity);
$this->dispatcher->dispatch($event);
$editForm = $this->createEditForm($activity);
$editForm->handleRequest($request);
if ($editForm->isSubmitted() && $editForm->isValid()) {
try {
$this->repository->saveActivity($activity);
$this->flashSuccess('action.update.success');
return $this->redirectToRoute('activity_details', ['id' => $activity->getId()]);
} catch (Exception $ex) {
$this->flashUpdateException($ex);
}
}
return $this->render('activity/edit.html.twig', [
'activity' => $activity,
'form' => $editForm->createView()
]);
}
/**
@@ -342,47 +380,6 @@ final class ActivityController extends AbstractController
return $writer->getFileResponse($spreadsheet);
}
/**
* @param Activity $activity
* @param Request $request
* @return RedirectResponse|Response
*/
protected function renderActivityForm(Activity $activity, Request $request)
{
$event = new ActivityMetaDefinitionEvent($activity);
$this->dispatcher->dispatch($event);
$editForm = $this->createEditForm($activity);
$editForm->handleRequest($request);
if ($editForm->isSubmitted() && $editForm->isValid()) {
try {
$this->repository->saveActivity($activity);
$this->flashSuccess('action.update.success');
if ($editForm->has('create_more') && $editForm->get('create_more')->getData() === true) {
$newActivity = new Activity();
$newActivity->setProject($activity->getProject());
$editForm = $this->createEditForm($newActivity);
$editForm->get('create_more')->setData(true);
$activity = $newActivity;
} else {
return $this->redirectToRoute('admin_activity');
}
} catch (Exception $ex) {
$this->flashUpdateException($ex);
}
}
return $this->render(
'activity/edit.html.twig',
[
'activity' => $activity,
'form' => $editForm->createView()
]
);
}
/**
* @param ActivityQuery $query
* @return FormInterface
@@ -417,7 +414,6 @@ final class ActivityController extends AbstractController
'action' => $url,
'method' => 'POST',
'currency' => $currency,
'create_more' => true,
'customer' => true,
'include_budget' => $this->isGranted('budget', $activity)
]);

10
src/Controller/ProjectController.php
View File

@@ -165,14 +165,7 @@ final class ProjectController extends AbstractController
$this->projectService->saveNewProject($project);
$this->flashSuccess('action.update.success');
if ($editForm->has('create_more') && $editForm->get('create_more')->getData() === true) {
$newProject = $this->projectService->createNewProject($project->getCustomer());
$editForm = $this->createEditForm($newProject);
$editForm->get('create_more')->setData(true);
$project = $newProject;
} else {
return $this->redirectToRoute('project_details', ['id' => $project->getId()]);
}
return $this->redirectToRoute('project_details', ['id' => $project->getId()]);
} catch (\Exception $ex) {
$this->flashUpdateException($ex);
}
@@ -530,7 +523,6 @@ final class ProjectController extends AbstractController
'action' => $url,
'method' => 'POST',
'currency' => $currency,
'create_more' => true,
'include_budget' => $this->isGranted('budget', $project)
]);
}

1
src/Form/API/ActivityApiEditForm.php
View File

@@ -34,7 +34,6 @@ class ActivityApiEditForm extends ActivityEditForm
$resolver->setDefaults([
'csrf_protection' => false,
'create_more' => false,
]);
}
}

1
src/Form/API/ProjectApiEditForm.php
View File

@@ -34,7 +34,6 @@ class ProjectApiEditForm extends ProjectEditForm
$resolver->setDefaults([
'csrf_protection' => false,
'create_more' => false,
]);
}
}

5
src/Form/ActivityEditForm.php
View File

@@ -115,10 +115,6 @@ class ActivityEditForm extends AbstractType
);
$this->addCommonFields($builder, $options);
if (null === $id && $options['create_more']) {
$this->addCreateMore($builder);
}
}
/**
@@ -131,7 +127,6 @@ class ActivityEditForm extends AbstractType
'csrf_protection' => true,
'csrf_field_name' => '_token',
'csrf_token_id' => 'admin_activity_edit',
'create_more' => false,
'customer' => false,
'currency' => Customer::DEFAULT_CURRENCY,
'include_budget' => false,

5
src/Form/ProjectEditForm.php
View File

@@ -88,10 +88,6 @@ class ProjectEditForm extends AbstractType
]);
$this->addCommonFields($builder, $options);
if (null === $id && $options['create_more']) {
$this->addCreateMore($builder);
}
}
/**
@@ -107,7 +103,6 @@ class ProjectEditForm extends AbstractType
'currency' => Customer::DEFAULT_CURRENCY,
'date_format' => null,
'include_budget' => false,
'create_more' => false,
'attr' => [
'data-form-event' => 'kimai.projectUpdate'
],