From da12aedb5308061ee1f0c4e4cc82307b7ab4870e Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 10 Dec 2021 17:40:40 +0100
Subject: [PATCH] household: redirect to the household page when a household is
 created from a person

---
 .../public/vuejs/HouseholdMembersEditor/store/index.js | 10 +++++++---
 .../Resources/views/Person/household_history.html.twig |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
index e15d79349..7bcc8c845 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -533,10 +533,14 @@ const store = createStore({
 
               // nothing to do anymore here, bye-bye !
               let params = new URLSearchParams(window.location.search);
-              if (params.has('returnPath')) {
-                window.location.replace(params.get('returnPath'));
-              } else {
+              if (params.has('followAfter')) {
                 window.location.replace(`/fr/person/household/${household_id}/summary`);
+              } else {
+                if (params.has('returnPath')) {
+                  window.location.replace(params.get('returnPath'));
+                } else {
+                  window.location.replace(`/fr/person/household/${household_id}/summary`);
+                }
               }
             } else {
               // we assume the answer was 422...
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
index 5dff4b074..7bc83e51e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
@@ -17,7 +17,7 @@
 
                 <ul class="record_actions">
                     <li>
-                        <a class="btn btn-misc" href="{{chill_path_add_return_path('chill_person_household_members_editor', { 'persons': [ person.id ]}) }}">
+                        <a class="btn btn-misc" href="{{chill_path_add_return_path('chill_person_household_members_editor', { 'persons': [ person.id ], 'followAfter': 'true'}) }}">
                             <i class="fa fa-sign-out"></i>
                             {{ 'household.Join'|trans }}
                         </a>