Commit 18b87a0d by Damien Moulard

Merge branch '2469-correct-affect-associate-button' into 'dev_cooperatic'

2469 correct affect associate button

See merge request !145
parents e2fd0fe2 50c25ff1
Pipeline #1931 passed with stage
in 1 minute 30 seconds
...@@ -217,7 +217,7 @@ function delete_shift_registration(shift_registration_id) { ...@@ -217,7 +217,7 @@ function delete_shift_registration(shift_registration_id) {
* @param {string} shift_id * @param {string} shift_id
*/ */
function affect_shift(partner, shift_id) { function affect_shift(partner, shift_id) {
if (is_time_to('affect_shift')) { if (is_time_to('affect_shift', 1000)) {
tData = 'idShiftRegistration=' + shift_id tData = 'idShiftRegistration=' + shift_id
+'&idPartner=' + partner_data.partner_id +'&idPartner=' + partner_data.partner_id
+ '&affected_partner=' + partner + '&affected_partner=' + partner
...@@ -415,8 +415,8 @@ function init_shifts_list() { ...@@ -415,8 +415,8 @@ function init_shifts_list() {
modal_template.find("#shift_associate").text(partner_data.associated_partner_name); modal_template.find("#shift_associate").text(partner_data.associated_partner_name);
} else { } else {
modal_template.find("#shift_partner").text(partner_data.name); modal_template.find("#shift_partner").text(partner_data.parent_name);
modal_template.find("#shift_associate").text(partner_data.parent_name); modal_template.find("#shift_associate").text(partner_data.name);
} }
openModal( openModal(
......
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