Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig

@@ -14,7 +14,7 @@
 
     <div id="withoutHouseholdList" class="collapse p-3">
         <form method="GET"
-              action="{{ chill_path_add_return_path('chill_person_household_members_editor') }}">
+              action="{{ path('chill_person_household_members_editor') }}">
 
             <h3>{{ 'household.Select people to move'|trans }}</h3>
             <ul>
@@ -27,6 +27,7 @@
             </ul>
 
             <input type="hidden" name="expand_suggestions" value="true" />
+            <input type="hidden" name="returnPath" value="{{ app.request.requestUri|escape('html_attr') }}" />
             <input type="hidden" name="accompanying_period_id" value="{{ accompanyingCourse.id }}" />
             <ul class="record_actions mb-0">
                 <li>