diff --git a/src/Controller/ActivityController.php b/src/Controller/ActivityController.php
index 3b4803a..8e2d7bd 100644
--- a/src/Controller/ActivityController.php
+++ b/src/Controller/ActivityController.php
@@ -150,12 +150,40 @@
}
}
+ // Activity delete form
+ /** @var ActivityDeleteForm $activityDeleteForm */
+ $activityDeleteForm = $this->createNamedCustomForm('activityDelete', ActivityDeleteForm::class);
+ $activityDeleteForm->handleRequest($request);
+ if ($activityDeleteForm->isSubmitted() && $activityDeleteForm->isValid()) {
+ $errors = $activityDeleteForm->validate();
+ if (empty($errors)) {
+ if (!is_null($activity)) {
+ $entityManager->remove($activity);
+ $entityManager->flush();
+ return $this->ajaxFormAnswer([
+ 'redirect' => $this->generateUrl('activity_activities', [], UrlGenerator::ABSOLUTE_PATH),
+ ]);
+ } else {
+ return $this->ajaxFormAnswer([
+ 'error' => 'Activité non trouvé',
+ 'code' => Response::HTTP_BAD_REQUEST,
+ ]);
+ }
+ } else {
+ return $this->ajaxFormAnswer([
+ 'error' => join('
', $errors),
+ 'code' => Response::HTTP_BAD_REQUEST,
+ ]);
+ }
+ }
+
// Update fields
$activityEditForm->updateFields($activity);
return $this->render('activity/activity.html.twig', [
'activity' => $activity,
'activityEditForm' => $activityEditForm,
+ 'activityDeleteForm' => $activityDeleteForm,
]);
}
}
\ No newline at end of file
diff --git a/src/Controller/ActorController.php b/src/Controller/ActorController.php
index 7fdcaad..6293628 100644
--- a/src/Controller/ActorController.php
+++ b/src/Controller/ActorController.php
@@ -141,7 +141,7 @@
$entityManager->remove($actor);
$entityManager->flush();
return $this->ajaxFormAnswer([
- 'redirect' => $this->generateUrl('actors_actors', [], UrlGenerator::ABSOLUTE_PATH),
+ 'redirect' => $this->generateUrl('actor_actors', [], UrlGenerator::ABSOLUTE_PATH),
]);
} else {
return $this->ajaxFormAnswer([
@@ -163,8 +163,8 @@
return $this->render('actor/actor.html.twig', [
'actor' => $actor,
'activities' => $activities,
- 'editForm' => $actorEditForm,
- 'deleteForm' => $actorDeleteForm,
+ 'actorEditForm' => $actorEditForm,
+ 'actorDeleteForm' => $actorDeleteForm,
]);
}
}
diff --git a/templates/activity/activity.html.twig b/templates/activity/activity.html.twig
index d033013..a9996be 100644
--- a/templates/activity/activity.html.twig
+++ b/templates/activity/activity.html.twig
@@ -5,7 +5,7 @@
{% set returnPath=[{label: 'Activités', url: url('activity_activities', {}, false), title: 'Liste des activités'}] %}
{% block pageContent %}
-