From c52cf1445944cfcd79a40a035638dd793ed9e260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 29 Apr 2019 12:05:28 +0200
Subject: [PATCH] add return path for page show and edit for single task

---
 CHANGELOG.md                              |  4 ++++
 Resources/views/SingleTask/edit.html.twig | 13 ++++++-------
 Resources/views/SingleTask/show.html.twig |  8 ++++++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fa693cfb..80b8b41b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,3 +30,7 @@ Version 1.5.7
 
 - fix error when showing task list without person in context (issue #3) ;
 
+Version 1.5.8
+=============
+
+- add returnPath to page Show and List for Single tasks ;
diff --git a/Resources/views/SingleTask/edit.html.twig b/Resources/views/SingleTask/edit.html.twig
index 54ed69c14..4eb24af1c 100644
--- a/Resources/views/SingleTask/edit.html.twig
+++ b/Resources/views/SingleTask/edit.html.twig
@@ -36,13 +36,12 @@
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a class="sc-button bt-cancel" href="{{ path('chill_task_singletask_list', { 'person_id': person.id } ) }}">
-                {{ 'Back to the list'|trans }}
-            </a>
-        </li>
-        <li class="cancel">
-            <a href="{{ path('chill_task_single_task_show', { 'id': task.id, 'list_params': app.request.query.get('list_params', { } )} ) }}" class="sc-button">
-                {{ 'Cancel'|trans }}
+            <a class="sc-button bt-cancel" href="{% if app.request.query.has('returnPath') %}
+                {{ app.request.query.get('returnPath')|escape('html_attr') }}
+                {% else %}
+                {{ path('chill_task_single_task_show', { 'id': task.id, 'list_params': app.request.query.get('list_params', { } )} ) }}" class="sc-button">
+                {% endif %}
+                {{ app.request.query.get('returnLabel')|default('Cancel'|trans) }}
             </a>
         </li>
         <li>
diff --git a/Resources/views/SingleTask/show.html.twig b/Resources/views/SingleTask/show.html.twig
index 7c35e010a..f19825cdd 100644
--- a/Resources/views/SingleTask/show.html.twig
+++ b/Resources/views/SingleTask/show.html.twig
@@ -85,8 +85,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a class="sc-button bt-cancel" href="{{ path('chill_task_singletask_list', app.request.query.get('list_params', {}) ) }}">
-                {{ 'Back to the list'|trans }}
+            <a class="sc-button bt-cancel" href="{%- if app.request.query.has('returnPath') -%}
+                {{ app.request.query.get('returnPath')|escape('html_attr') }}
+                {%- else -%}
+                    {{ path('chill_task_singletask_list', app.request.query.get('list_params', {}) ) }}
+                {%- endif -%}">
+                {{ app.request.query.get('returnLabel')|default('Back to the list'|trans) }}
             </a>
         </li>
         {% if workflow_transitions(task)|length > 0 %}