fix delete workflow

src/Bundle/ChillMainBundle/Controller/WorkflowController.php

@@ -23,7 +23,7 @@ use Chill\MainBundle\Workflow\Validator\StepDestValid;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
-use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
@@ -114,24 +114,22 @@ class WorkflowController extends AbstractController
         $this->denyAccessUnlessGranted(EntityWorkflowVoter::DELETE, $entityWorkflow);
 
         $form = $this->createForm(FormType::class);
+        $form->add('submit', SubmitType::class, ['label' => 'workflow.Delete workflow']);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $this->entityManager->remove($entityWorkflow);;
+            $this->entityManager->remove($entityWorkflow);
             $this->entityManager->flush();
 
             $this->addFlash('success', $this->translator->trans('workflow.Workflow deleted with success'));
 
-            if ($request->query->has('returnPath')) {
+            return $this->redirectToRoute('chill_main_homepage');
-                return new RedirectResponse($request->query->get('returnPath'));
-            }
-
-            return $this->redirectToRoute('homepage');
         }
 
         return $this->render('@ChillMain/Workflow/delete.html.twig', [
             'entityWorkflow' => $entityWorkflow,
             'delete_form' => $form->createView(),
+            'handler' => $this->entityWorkflowManager->getHandler($entityWorkflow),
         ]);
     }
 

src/Bundle/ChillMainBundle/Resources/views/Workflow/delete.html.twig

@@ -2,6 +2,21 @@
 
 {% block title 'workflow.Delete workflow ?'|trans %}
 
+{% block display_content %}
+    <h2>
+        {{ 'workflow_'|trans }}
+    </h2>
+
+    {% include handler.templateTitle(entityWorkflow) with handler.templateTitleData(entityWorkflow)|merge({
+        'description': true,
+        'add_classes': 'ms-3 h3'
+    }) %}
+
+    {% include handler.template(entityWorkflow) with handler.templateData(entityWorkflow)|merge({
+        'display_action': false
+    }) %}
+{% endblock %}
+
 {% block content %}
 
     <div class="container chill-md-10">
@@ -9,6 +24,7 @@
             {
                 'title'             : 'workflow.Delete workflow ?'|trans,
                 'confirm_question'  : 'workflow.Are you sure you want to delete this workflow ?'|trans,
+                'display_content'   : block('display_content'),
                 'cancel_route'      : 'chill_main_workflow_show',
                 'cancel_parameters' : {'id' : entityWorkflow.id},
                 'form'              : delete_form

src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig

@@ -41,7 +41,9 @@
                 <li>
                     <a class="btn btn-delete"
                        href="{{ chill_path_add_return_path('chill_main_workflow_delete', {'id': entity_workflow.id}) }}"
-                    ></a>
+                    >
+                        {{ 'workflow.Delete workflow'|trans }}
+                    </a>
                 </li>
             </ul>
         {% endif %}

src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php

@@ -23,10 +23,10 @@ class EntityWorkflowVoter extends Voter
 {
     public const CREATE = 'CHILL_MAIN_WORKFLOW_CREATE';
 
-    public const SEE = 'CHILL_MAIN_WORKFLOW_SEE';
-
     public const DELETE = 'CHILL_MAIN_WORKFLOW_DELETE';
 
+    public const SEE = 'CHILL_MAIN_WORKFLOW_SEE';
+
     private EntityWorkflowManager $manager;
 
     private Security $security;
@@ -44,6 +44,7 @@ class EntityWorkflowVoter extends Voter
 
     /**
      * @param EntityWorkflow $subject
+     * @param mixed $attribute
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {

src/Bundle/ChillMainBundle/translations/messages.fr.yml

@@ -399,6 +399,7 @@ workflow:
     Workflow deleted with success: Le workflow a été supprimé
     Delete workflow ?: Supprimer le workflow ?
     Are you sure you want to delete this workflow ?: Êtes-vous sûr·e de vouloir supprimer ce workflow ?
+    Delete workflow: Supprimer le workflow
 
 Subscribe final: Recevoir une notification à l'étape finale
 Subscribe all steps: Recevoir une notification à chaque étape