Merge branch 'evolution_bdm' into ticket_1350

members_space/static/js/members-space-home.js

@@ -95,7 +95,11 @@ function init_home() {
         e.preventDefault();
         goto('mes-infos');
     });
-    $("#go_to_forms").prop("href", forms_link);
+    // $("#go_to_forms").prop("href", "forms_link");
+    $("#go_to_forms").on('click', (e) => {
+        e.preventDefault();
+        goto('faq');
+    });
     
     if (partner_data.is_in_association === false) {
         $("#home .member_associated_partner_area").hide();

shifts/views.py

@@ -194,7 +194,7 @@ def change_shift(request):
                     "idPartner": int(request.POST['idPartner']),
                     "idShift": int(request.POST['idNewShift']),
                     "shift_type": request.POST['shift_type'],
-                    "is_makeup": cs.shift_is_makeup(idOldShift)
+                    "is_makeup": cs.shift_is_makeup(listRegister)
                 }
                 
                 should_block_service_exchange = getattr(settings, 'BLOCK_SERVICE_EXCHANGE_24H_BEFORE', False)

templates/members_space/home.html

@@ -83,7 +83,6 @@
         <div class="home_link_button_area">
           <a
             href="javascript:void(0);"
-            target="_blank"
             class="btn--primary home_link_button"
             id="go_to_forms"
           >