Skip to content

Commit 4d12c3b

Browse files
Link to jira BMS-4397
Issue: BMS-5187 / BMS-5188 / BMS-5189 Reviewer: None
1 parent b24d123 commit 4d12c3b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/main/webapp/WEB-INF/static/js/fbk-data-table/measurements-table-trial.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ var getColumns = function(displayColumns, displayTrialInstance) {
110110
jQuery.each(displayColumns, function(i, displayColumn) {
111111
columns.push({
112112
title: displayColumn.name,
113-
data: displayColumn.termId < 0 ? displayColumn.termId : displayColumn.name, // FIXME handle collisions between real and virtual variables when they have the same name. I.e: special column SAMPLES
113+
data: displayColumn.termId < 0 ? displayColumn.termId : displayColumn.name, // FIXME BMS-4397 handle collisions between real and virtual variables when they have the same name. I.e: special column SAMPLES
114114
termId: displayColumn.termId,
115115
defaultContent: '',
116116
orderable: displayColumn.variableType === "TRAIT" ? true : $.inArray(displayColumn.termId, sortableColumnIDs) > -1,
@@ -425,7 +425,11 @@ BMS.Fieldbook.MeasurementsDataTable = (function($) {
425425
]
426426
});
427427

428-
new $.fn.dataTable.ColReorder(table);
428+
try {
429+
new $.fn.dataTable.ColReorder(table);
430+
} catch (e) {
431+
console.log(e)
432+
}
429433

430434
if (studyId !== '') {
431435
// Activate an inline edit on click of a table cell

0 commit comments

Comments
 (0)