From 298044bc82ba16e3e3205466098ac0921d6bc305 Mon Sep 17 00:00:00 2001 From: LenaertsJ Date: Mon, 30 Jun 2025 08:44:24 +0000 Subject: [PATCH] Improve admin templates for event admin entities + activity reason (category)... --- .../unreleased/Fixed-20250611-164623.yaml | 6 ++ .changes/unreleased/UX-20250617-192650.yaml | 6 ++ .../ActivityReasonCategoryController.php | 47 +------------ .../Controller/ActivityReasonController.php | 45 +----------- .../views/ActivityReason/index.html.twig | 7 +- .../ActivityReasonCategory/index.html.twig | 7 +- .../Controller/EventTypeController.php | 68 +------------------ .../Controller/RoleController.php | 66 +----------------- .../Controller/StatusController.php | 65 +----------------- .../Resources/views/EventType/edit.html.twig | 2 +- .../Resources/views/EventType/index.html.twig | 7 +- .../Resources/views/EventType/new.html.twig | 2 +- .../Resources/views/EventType/show.html.twig | 7 +- .../Resources/views/Role/edit.html.twig | 4 +- .../Resources/views/Role/index.html.twig | 7 +- .../Resources/views/Role/new.html.twig | 2 +- .../Resources/views/Role/show.html.twig | 7 +- .../Resources/views/Status/edit.html.twig | 2 +- .../Resources/views/Status/index.html.twig | 7 +- .../Resources/views/Status/new.html.twig | 2 +- .../Resources/views/Status/show.html.twig | 7 +- .../Form/PersonResourceType.php | 10 ++- .../views/PersonResource/form.html.twig | 12 ++-- .../translations/messages.fr.yml | 4 ++ 24 files changed, 54 insertions(+), 345 deletions(-) create mode 100644 .changes/unreleased/Fixed-20250611-164623.yaml create mode 100644 .changes/unreleased/UX-20250617-192650.yaml diff --git a/.changes/unreleased/Fixed-20250611-164623.yaml b/.changes/unreleased/Fixed-20250611-164623.yaml new file mode 100644 index 000000000..8bb956c34 --- /dev/null +++ b/.changes/unreleased/Fixed-20250611-164623.yaml @@ -0,0 +1,6 @@ +kind: Fixed +body: Fix admin entity edit actions for event admin entities and activity reason (category) entities +time: 2025-06-11T16:46:23.113506434+02:00 +custom: + Issue: "" + SchemaChange: No schema change diff --git a/.changes/unreleased/UX-20250617-192650.yaml b/.changes/unreleased/UX-20250617-192650.yaml new file mode 100644 index 000000000..810758b10 --- /dev/null +++ b/.changes/unreleased/UX-20250617-192650.yaml @@ -0,0 +1,6 @@ +kind: UX +body: Improve labeling of fields in person resource creation form +time: 2025-06-17T19:26:50.599703116+02:00 +custom: + Issue: "" + SchemaChange: No schema change diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php index 0d337416b..6ccddcc97 100644 --- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php +++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php @@ -48,28 +48,6 @@ class ActivityReasonCategoryController extends AbstractController ]); } - /** - * Displays a form to edit an existing ActivityReasonCategory entity. - */ - #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/edit', name: 'chill_activity_activityreasoncategory_edit')] - public function editAction(mixed $id) - { - $em = $this->managerRegistry->getManager(); - - $entity = $em->getRepository(ActivityReasonCategory::class)->find($id); - - if (!$entity) { - throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.'); - } - - $editForm = $this->createEditForm($entity); - - return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [ - 'entity' => $entity, - 'edit_form' => $editForm->createView(), - ]); - } - /** * Lists all ActivityReasonCategory entities. */ @@ -100,29 +78,10 @@ class ActivityReasonCategoryController extends AbstractController ]); } - /** - * Finds and displays a ActivityReasonCategory entity. - */ - #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/show', name: 'chill_activity_activityreasoncategory_show')] - public function showAction(mixed $id) - { - $em = $this->managerRegistry->getManager(); - - $entity = $em->getRepository(ActivityReasonCategory::class)->find($id); - - if (!$entity) { - throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.'); - } - - return $this->render('@ChillActivity/ActivityReasonCategory/show.html.twig', [ - 'entity' => $entity, - ]); - } - /** * Edits an existing ActivityReasonCategory entity. */ - #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/update', name: 'chill_activity_activityreasoncategory_update', methods: ['POST', 'PUT'])] + #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/update', name: 'chill_activity_activityreasoncategory_update')] public function updateAction(Request $request, mixed $id) { $em = $this->managerRegistry->getManager(); @@ -139,7 +98,7 @@ class ActivityReasonCategoryController extends AbstractController if ($editForm->isSubmitted() && $editForm->isValid()) { $em->flush(); - return $this->redirectToRoute('chill_activity_activityreasoncategory_edit', ['id' => $id]); + return $this->redirectToRoute('chill_activity_activityreasoncategory', ['id' => $id]); } return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [ @@ -178,7 +137,7 @@ class ActivityReasonCategoryController extends AbstractController { $form = $this->createForm(ActivityReasonCategoryType::class, $entity, [ 'action' => $this->generateUrl('chill_activity_activityreasoncategory_update', ['id' => $entity->getId()]), - 'method' => 'PUT', + 'method' => 'POST', ]); $form->add('submit', SubmitType::class, ['label' => 'Update']); diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php index 37d04d367..0167273c5 100644 --- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php +++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php @@ -50,28 +50,6 @@ class ActivityReasonController extends AbstractController ]); } - /** - * Displays a form to edit an existing ActivityReason entity. - */ - #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/edit', name: 'chill_activity_activityreason_edit')] - public function editAction(mixed $id) - { - $em = $this->managerRegistry->getManager(); - - $entity = $em->getRepository(ActivityReason::class)->find($id); - - if (null === $entity) { - throw new NotFoundHttpException('Unable to find ActivityReason entity.'); - } - - $editForm = $this->createEditForm($entity); - - return $this->render('@ChillActivity/ActivityReason/edit.html.twig', [ - 'entity' => $entity, - 'edit_form' => $editForm->createView(), - ]); - } - /** * Lists all ActivityReason entities. */ @@ -102,29 +80,10 @@ class ActivityReasonController extends AbstractController ]); } - /** - * Finds and displays a ActivityReason entity. - */ - #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/show', name: 'chill_activity_activityreason_show')] - public function showAction(mixed $id) - { - $em = $this->managerRegistry->getManager(); - - $entity = $em->getRepository(ActivityReason::class)->find($id); - - if (!$entity) { - throw $this->createNotFoundException('Unable to find ActivityReason entity.'); - } - - return $this->render('@ChillActivity/ActivityReason/show.html.twig', [ - 'entity' => $entity, - ]); - } - /** * Edits an existing ActivityReason entity. */ - #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/update', name: 'chill_activity_activityreason_update', methods: ['POST', 'PUT'])] + #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/update', name: 'chill_activity_activityreason_update')] public function updateAction(Request $request, mixed $id) { $em = $this->managerRegistry->getManager(); @@ -180,7 +139,7 @@ class ActivityReasonController extends AbstractController { $form = $this->createForm(ActivityReasonType::class, $entity, [ 'action' => $this->generateUrl('chill_activity_activityreason_update', ['id' => $entity->getId()]), - 'method' => 'PUT', + 'method' => 'POST', ]); $form->add('submit', SubmitType::class, ['label' => 'Update']); diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig index 855c9386d..ee36958c3 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig @@ -3,7 +3,7 @@ {% block admin_content %}

{{ 'ActivityReason list'|trans }}

- +
@@ -29,10 +29,7 @@ diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig index 5f48180b3..f64ce359d 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig @@ -3,7 +3,7 @@ {% block admin_content %}

{{ 'ActivityReasonCategory list'|trans }}

-
{{ 'Name'|trans }}
  • - -
    • -
  • - +
+
@@ -23,10 +23,7 @@ diff --git a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php index f7b1b205c..969e60cb7 100644 --- a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php +++ b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php @@ -48,30 +48,6 @@ class EventTypeController extends AbstractController ]); } - /** - * Deletes a EventType entity. - */ - #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/event/event_type/{id}/delete', name: 'chill_eventtype_admin_delete', methods: ['POST', 'DELETE'])] - public function deleteAction(Request $request, mixed $id) - { - $form = $this->createDeleteForm($id); - $form->handleRequest($request); - - if ($form->isSubmitted() && $form->isValid()) { - $em = $this->managerRegistry->getManager(); - $entity = $em->getRepository(EventType::class)->find($id); - - if (!$entity) { - throw $this->createNotFoundException('Unable to find EventType entity.'); - } - - $em->remove($entity); - $em->flush(); - } - - return $this->redirectToRoute('chill_eventtype_admin'); - } - /** * Displays a form to edit an existing EventType entity. */ @@ -87,12 +63,10 @@ class EventTypeController extends AbstractController } $editForm = $this->createEditForm($entity); - $deleteForm = $this->createDeleteForm($id); return $this->render('@ChillEvent/EventType/edit.html.twig', [ 'entity' => $entity, 'edit_form' => $editForm->createView(), - 'delete_form' => $deleteForm->createView(), ]); } @@ -126,28 +100,6 @@ class EventTypeController extends AbstractController ]); } - /** - * Finds and displays a EventType entity. - */ - #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/event/event_type/{id}/show', name: 'chill_eventtype_admin_show')] - public function showAction(mixed $id) - { - $em = $this->managerRegistry->getManager(); - - $entity = $em->getRepository(EventType::class)->find($id); - - if (!$entity) { - throw $this->createNotFoundException('Unable to find EventType entity.'); - } - - $deleteForm = $this->createDeleteForm($id); - - return $this->render('@ChillEvent/EventType/show.html.twig', [ - 'entity' => $entity, - 'delete_form' => $deleteForm->createView(), - ]); - } - /** * Edits an existing EventType entity. */ @@ -162,7 +114,6 @@ class EventTypeController extends AbstractController throw $this->createNotFoundException('Unable to find EventType entity.'); } - $deleteForm = $this->createDeleteForm($id); $editForm = $this->createEditForm($entity); $editForm->handleRequest($request); @@ -175,7 +126,6 @@ class EventTypeController extends AbstractController return $this->render('@ChillEvent/EventType/edit.html.twig', [ 'entity' => $entity, 'edit_form' => $editForm->createView(), - 'delete_form' => $deleteForm->createView(), ]); } @@ -198,22 +148,6 @@ class EventTypeController extends AbstractController return $form; } - /** - * Creates a form to delete a EventType entity by id. - * - * @return \Symfony\Component\Form\FormInterface The form - */ - private function createDeleteForm(mixed $id) - { - return $this->createFormBuilder() - ->setAction($this->generateUrl( - 'chill_eventtype_admin_delete', - ['id' => $id] - )) - ->add('submit', SubmitType::class, ['label' => 'Delete']) - ->getForm(); - } - /** * Creates a form to edit a EventType entity. * @@ -228,7 +162,7 @@ class EventTypeController extends AbstractController 'chill_eventtype_admin_update', ['id' => $entity->getId()] ), - 'method' => 'PUT', + 'method' => 'POST', ]); $form->add('submit', SubmitType::class, ['label' => 'Update']); diff --git a/src/Bundle/ChillEventBundle/Controller/RoleController.php b/src/Bundle/ChillEventBundle/Controller/RoleController.php index 1ff205dfc..9d0c38c92 100644 --- a/src/Bundle/ChillEventBundle/Controller/RoleController.php +++ b/src/Bundle/ChillEventBundle/Controller/RoleController.php @@ -48,30 +48,6 @@ class RoleController extends AbstractController ]); } - /** - * Deletes a Role entity. - */ - #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/event/role/{id}/delete', name: 'chill_event_admin_role_delete', methods: ['POST', 'DELETE'])] - public function deleteAction(Request $request, mixed $id) - { - $form = $this->createDeleteForm($id); - $form->handleRequest($request); - - if ($form->isSubmitted() && $form->isValid()) { - $em = $this->managerRegistry->getManager(); - $entity = $em->getRepository(Role::class)->find($id); - - if (!$entity) { - throw $this->createNotFoundException('Unable to find Role entity.'); - } - - $em->remove($entity); - $em->flush(); - } - - return $this->redirectToRoute('chill_event_admin_role'); - } - /** * Displays a form to edit an existing Role entity. */ @@ -87,12 +63,10 @@ class RoleController extends AbstractController } $editForm = $this->createEditForm($entity); - $deleteForm = $this->createDeleteForm($id); return $this->render('@ChillEvent/Role/edit.html.twig', [ 'entity' => $entity, 'edit_form' => $editForm->createView(), - 'delete_form' => $deleteForm->createView(), ]); } @@ -126,28 +100,6 @@ class RoleController extends AbstractController ]); } - /** - * Finds and displays a Role entity. - */ - #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/event/role/{id}/show', name: 'chill_event_admin_role_show')] - public function showAction(mixed $id) - { - $em = $this->managerRegistry->getManager(); - - $entity = $em->getRepository(Role::class)->find($id); - - if (!$entity) { - throw $this->createNotFoundException('Unable to find Role entity.'); - } - - $deleteForm = $this->createDeleteForm($id); - - return $this->render('@ChillEvent/Role/show.html.twig', [ - 'entity' => $entity, - 'delete_form' => $deleteForm->createView(), - ]); - } - /** * Edits an existing Role entity. */ @@ -162,7 +114,6 @@ class RoleController extends AbstractController throw $this->createNotFoundException('Unable to find Role entity.'); } - $deleteForm = $this->createDeleteForm($id); $editForm = $this->createEditForm($entity); $editForm->handleRequest($request); @@ -175,7 +126,6 @@ class RoleController extends AbstractController return $this->render('@ChillEvent/Role/edit.html.twig', [ 'entity' => $entity, 'edit_form' => $editForm->createView(), - 'delete_form' => $deleteForm->createView(), ]); } @@ -198,20 +148,6 @@ class RoleController extends AbstractController return $form; } - /** - * Creates a form to delete a Role entity by id. - * - * @return \Symfony\Component\Form\FormInterface The form - */ - private function createDeleteForm(mixed $id) - { - return $this->createFormBuilder() - ->setAction($this->generateUrl('chill_event_admin_role_delete', ['id' => $id])) - ->setMethod('DELETE') - ->add('submit', SubmitType::class, ['label' => 'Delete']) - ->getForm(); - } - /** * Creates a form to edit a Role entity. * @@ -226,7 +162,7 @@ class RoleController extends AbstractController 'chill_event_admin_role_update', ['id' => $entity->getId()] ), - 'method' => 'PUT', + 'method' => 'POST', ]); $form->add('submit', SubmitType::class, ['label' => 'Update']); diff --git a/src/Bundle/ChillEventBundle/Controller/StatusController.php b/src/Bundle/ChillEventBundle/Controller/StatusController.php index 3b302500d..1001fe269 100644 --- a/src/Bundle/ChillEventBundle/Controller/StatusController.php +++ b/src/Bundle/ChillEventBundle/Controller/StatusController.php @@ -48,30 +48,6 @@ class StatusController extends AbstractController ]); } - /** - * Deletes a Status entity. - */ - #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/event/status/{id}/delete', name: 'chill_event_admin_status_delete', methods: ['POST', 'DELETE'])] - public function deleteAction(Request $request, mixed $id) - { - $form = $this->createDeleteForm($id); - $form->handleRequest($request); - - if ($form->isSubmitted() && $form->isValid()) { - $em = $this->managerRegistry->getManager(); - $entity = $em->getRepository(Status::class)->find($id); - - if (!$entity) { - throw $this->createNotFoundException('Unable to find Status entity.'); - } - - $em->remove($entity); - $em->flush(); - } - - return $this->redirectToRoute('chill_event_admin_status'); - } - /** * Displays a form to edit an existing Status entity. */ @@ -87,12 +63,10 @@ class StatusController extends AbstractController } $editForm = $this->createEditForm($entity); - $deleteForm = $this->createDeleteForm($id); return $this->render('@ChillEvent/Status/edit.html.twig', [ 'entity' => $entity, 'edit_form' => $editForm->createView(), - 'delete_form' => $deleteForm->createView(), ]); } @@ -126,28 +100,6 @@ class StatusController extends AbstractController ]); } - /** - * Finds and displays a Status entity. - */ - #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/event/status/{id}/show', name: 'chill_event_admin_status_show')] - public function showAction(mixed $id) - { - $em = $this->managerRegistry->getManager(); - - $entity = $em->getRepository(Status::class)->find($id); - - if (!$entity) { - throw $this->createNotFoundException('Unable to find Status entity.'); - } - - $deleteForm = $this->createDeleteForm($id); - - return $this->render('@ChillEvent/Status/show.html.twig', [ - 'entity' => $entity, - 'delete_form' => $deleteForm->createView(), - ]); - } - /** * Edits an existing Status entity. */ @@ -162,7 +114,6 @@ class StatusController extends AbstractController throw $this->createNotFoundException('Unable to find Status entity.'); } - $deleteForm = $this->createDeleteForm($id); $editForm = $this->createEditForm($entity); $editForm->handleRequest($request); @@ -175,7 +126,6 @@ class StatusController extends AbstractController return $this->render('@ChillEvent/Status/edit.html.twig', [ 'entity' => $entity, 'edit_form' => $editForm->createView(), - 'delete_form' => $deleteForm->createView(), ]); } @@ -198,19 +148,6 @@ class StatusController extends AbstractController return $form; } - /** - * Creates a form to delete a Status entity by id. - * - * @return \Symfony\Component\Form\FormInterface The form - */ - private function createDeleteForm(mixed $id) - { - return $this->createFormBuilder() - ->setAction($this->generateUrl('chill_event_admin_status_delete', ['id' => $id])) - ->add('submit', SubmitType::class, ['label' => 'Delete']) - ->getForm(); - } - /** * Creates a form to edit a Status entity. * @@ -222,7 +159,7 @@ class StatusController extends AbstractController { $form = $this->createForm(StatusType::class, $entity, [ 'action' => $this->generateUrl('chill_event_admin_status_update', ['id' => $entity->getId()]), - 'method' => 'PUT', + 'method' => 'POST', ]); $form->add('submit', SubmitType::class, ['label' => 'Update']); diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig index 151a9ec0c..28a5b22e8 100644 --- a/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig +++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig @@ -8,7 +8,7 @@ {{ form_row(edit_form.name) }} {{ form_row(edit_form.active) }} - {% for entity in entities %} - + - +
{{ 'Name'|trans }}
  • - -
    • -
  • - +
{{ entity.id }}{{ entity.id }} {{ entity.name|localize_translatable_string }}{{ entity.active }}
    -
  • - -
    • diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig index 3474ddd01..778f2cf73 100644 --- a/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig +++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig @@ -8,7 +8,7 @@ {{ form_row(form.name) }} {{ form_row(form.active) }} -
      +
      • {{ 'Back to the list'|trans }}
        • diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig index d50a97f15..ce879a719 100644 --- a/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig +++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig @@ -21,17 +21,12 @@
-