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
This commit is contained in:
acognet
2022-09-14 11:01:30 +02:00
parent 7d1893a2b8 1ee5432b96
commit cea75e07f2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/utils.js
View File

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