From 1403ee2ba5578d043c01044bea18aa57b01dabe4 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 1 Oct 2021 10:49:55 +0200
Subject: [PATCH] redirect after submit bug fixed for edit and delete when
 coming from show.html.twig

---
 .../Resources/views/SingleTask/_show.html.twig     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_show.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_show.html.twig
index f73f2740d..1186fb125 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_show.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_show.html.twig
@@ -30,10 +30,12 @@
 			{% endif %}
 		</dd>
 
-		<dt class="inline">{{ 'Scope'|trans }}</dt>
-		<dd>
-			<span class="scope">{{ task.scope.name|localize_translatable_string }}</span>
-		</dd>
+		{% if task.scope is not null %}
+			<dt class="inline">{{ 'Scope'|trans }}</dt>
+			<dd>
+				<span class="scope">{{ task.scope.name|localize_translatable_string }}</span>
+			</dd>
+		{% endif %}
 
 		<h3>{{"Dates"|trans}}</h3>
 		{% if task.startDate is null and task.endDate is null and task.warningDate is null %}
@@ -94,7 +96,7 @@
 
 	{% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
 		<li>
-			<a class="btn btn-update" href="{{ path('chill_task_single_task_edit', { 'id': task.id }) }}">
+			<a class="btn btn-update" href="{{ path('chill_task_single_task_edit', { 'id': task.id, 'list_params': app.request.query.all['list_params'] }) }}">
 				{{ 'Edit the task'|trans }}
 			</a>
 		</li>
@@ -102,7 +104,7 @@
 
 	{% if is_granted('CHILL_TASK_TASK_CREATE', task) %}
 		<li>
-			<a href="{{ path('chill_task_single_task_delete', { 'id': task.id } ) }}" class="btn btn-delete">
+			<a href="{{ path('chill_task_single_task_delete', { 'id': task.id, 'list_params': app.request.query.all['list_params'] } ) }}" class="btn btn-delete">
 				{{ 'Delete'|trans }}
 			</a>
 		</li>