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

N°3912 - Polishing: Export

Browse Source
This commit is contained in:
acognet
2021-09-30 15:05:56 +02:00
parent 62be3f9f58
commit e86454ff74
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/tabularfieldsselector.js
View File

@@ -147,7 +147,8 @@ $(function () {
me._mark_as_selected($(this).val(), bChecked);
});
jSelector.find('.tfs_checkbox_multi').each(function () {
var oField = me._get_main_field_by_code($(this).val());
var sMultiFieldCode = $(this).val();
var oField = me._get_main_field_by_code(sMultiFieldCode);
if (oField != null) {
$(this).prop('checked', bChecked);
$(this).prop('indeterminate', false);
@@ -158,6 +159,7 @@ $(function () {
sElementId = (sPrefix+oField.subattr[k].code).replace('.', '_');
$(sElementId).prop('checked', bChecked);
}
me._update_tooltips(sMultiFieldCode);
}
});
this._update_holder();

20
js/utils.js
View File

@@ -388,11 +388,23 @@ function ExportListDlg(sOQL, sDataTableId, sFormat, sDlgTitle) {
var sDataTableName = 'datatable_'+sDataTableId;
var oColumns = $('#'+sDataTableName).DataTable().ajax.params()['columns'];
for (var j in oColumns) {
var sCode = oColumns[j]['data'].split("/");
if (sCode[1] == '_key_') {
sCode[1] = 'id';
if (oColumns[j]['data']) {
var sCode = oColumns[j]['data'].split("/");
if (sCode[1] == '_key_') {
sCode[1] = 'id';
}
aFields.push(sCode[0]+'.'+sCode[1]);
} else {
for (var k in oColumns[j]) {
if (oColumns[j][k].checked) {
var sCode = oColumns[j][k].code;
if (sCode == '_key_') {
sCode = 'id';
}
aFields.push(j+'.'+sCode);
}
}
}
aFields.push(sCode[0]+'.'+sCode[1]);
}
}