composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	js/links/links_widget.js
This commit is contained in:
Molkobain
2023-04-26 11:59:00 +02:00
parent d58ff8d73a f15ac75f8f
commit 7e08f6131c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/links/links_widget.js
View File

@@ -69,6 +69,9 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
$('#linkedset_'+me.id+' .selection:checked').closest('tr').each(function () {
me.Remove($(this));
});
// N°6124 Only draw table once for performance reasons
$('#datatable_'+me.id).DataTable().draw();
// Disable the button since all the selected items have been removed
$(my_id+'_btnRemove').prop('disabled', true);
@@ -82,7 +85,7 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
};
this.Remove = function(oRowElement){
$('#datatable_'+me.id).DataTable().row($(oRowElement)).remove().draw();
$('#datatable_'+me.id).DataTable().row($(oRowElement)).remove();
var oCheckbox = $(oRowElement).find('.selection');
let iLink = $(oCheckbox).attr('data-link-id');
if (iLink > 0) {
@@ -265,9 +268,10 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
function (data) {
if (data != '') {
$.each(data.data, function (idx, row) {
$('#datatable_'+me.id).DataTable().row.add(row).draw();
$('#datatable_'+me.id).DataTable().row.add(row);
});
// N°6124 Only draw table once for performance reasons
$('#datatable_'+me.id).DataTable().draw();
$.each(data.scripts, function (idx, script) {
$.globalEval(script);
@@ -277,7 +281,6 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
$(this).trigger('validate', '');
}); // Validate newly added form fields...
$('#datatable_'+me.id).DataTable().columns.adjust().draw();
//$('#datatable_team_list').DataTable().columns.adjust().draw();
$('#busy_'+me.iInputId).html('');
}
},