Commit 8ada00eb by Etienne Freiss

Merge branch 'evolution_bdm' into ticket_1350

parents cd0ebe88 1de6869e
Pipeline #1519 passed with stage
in 1 minute 28 seconds
...@@ -95,7 +95,11 @@ function init_home() { ...@@ -95,7 +95,11 @@ function init_home() {
e.preventDefault(); e.preventDefault();
goto('mes-infos'); 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) { if (partner_data.is_in_association === false) {
$("#home .member_associated_partner_area").hide(); $("#home .member_associated_partner_area").hide();
......
...@@ -194,7 +194,7 @@ def change_shift(request): ...@@ -194,7 +194,7 @@ def change_shift(request):
"idPartner": int(request.POST['idPartner']), "idPartner": int(request.POST['idPartner']),
"idShift": int(request.POST['idNewShift']), "idShift": int(request.POST['idNewShift']),
"shift_type": request.POST['shift_type'], "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) should_block_service_exchange = getattr(settings, 'BLOCK_SERVICE_EXCHANGE_24H_BEFORE', False)
......
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
<div class="home_link_button_area"> <div class="home_link_button_area">
<a <a
href="javascript:void(0);" href="javascript:void(0);"
target="_blank"
class="btn--primary home_link_button" class="btn--primary home_link_button"
id="go_to_forms" id="go_to_forms"
> >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment