diff --git a/js/common.js b/js/common.js index c4147cfe247..34e47947fa7 100644 --- a/js/common.js +++ b/js/common.js @@ -1904,7 +1904,7 @@ function setupAdaptDropdown(config) } const select2_el = $('#' + field_id).select2(options); - select2_el.bind('setValue', (e, value) => { + select2_el.bind('setValue', (e, ...value) => { $('#' + field_id).val(value).trigger('change'); }); $('label[for=' + field_id + ']').on('click', function () { diff --git a/templates/components/itilobject/timeline/form_validation.html.twig b/templates/components/itilobject/timeline/form_validation.html.twig index ae33edb00ec..c561434dbf3 100644 --- a/templates/components/itilobject/timeline/form_validation.html.twig +++ b/templates/components/itilobject/timeline/form_validation.html.twig @@ -352,6 +352,7 @@ $("#dropdown__validatortype_{{ rand }}").trigger('setValue', data.validatortype); if (data.groups_id !== undefined && data.groups_id !== null) { + // Approver is a group or multiple users of a group waitForElement("#dropdown_groups_id{{ rand }}").then((elm) => { // set groups_id $("#dropdown_groups_id{{ rand }}").ready(function() { @@ -366,6 +367,7 @@ }); }); } else if (data.items_id_target !== undefined) { + // Approver is a single user new Promise((resolve) => { // if dropdown_items_id_target exists, wait for it to be removed // is required because the dropdown is removed and recreated when the setValue is triggered