From 5c6386f5cb49560b124a5b0a94be7d65eeb095b1 Mon Sep 17 00:00:00 2001 From: james-cui <61567716+james-cui@users.noreply.github.com> Date: Thu, 9 Apr 2020 22:39:24 -0700 Subject: [PATCH] =?UTF-8?q?Fix=20that=20columns=20named=20=C2=AB=20toStrin?= =?UTF-8?q?g=20=C2=BB=20are=20displayed=20as=20collapsed=20(#2531)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #2451 --- .../core/scripts/views/data-table/data-table-view.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/webapp/modules/core/scripts/views/data-table/data-table-view.js b/main/webapp/modules/core/scripts/views/data-table/data-table-view.js index 6ce33473d..5126c404d 100644 --- a/main/webapp/modules/core/scripts/views/data-table/data-table-view.js +++ b/main/webapp/modules/core/scripts/views/data-table/data-table-view.js @@ -229,7 +229,7 @@ DataTableView.prototype._renderDataTables = function(table, headerTable) { for (var c = 0; c < columns.length; c++) { var column = columns[c]; var td = tr.insertCell(tr.cells.length); - if (column.name in self._collapsedColumnNames) { + if (self._collapsedColumnNames.hasOwnProperty(column.name)) { $(td).html(' '); } else { for (var k = 0; k < keys.length; k++) { @@ -316,7 +316,7 @@ DataTableView.prototype._renderDataTables = function(table, headerTable) { var createColumnHeader = function(column, index) { var td = trHead.insertCell(trHead.cells.length); $(td).addClass("column-header").attr('title', column.name); - if (column.name in self._collapsedColumnNames) { + if (self._collapsedColumnNames.hasOwnProperty(column.name)) { $(td).html(" ").click(function(evt) { delete self._collapsedColumnNames[column.name]; self.render(); @@ -405,7 +405,7 @@ DataTableView.prototype._renderDataTables = function(table, headerTable) { for (var i = 0; i < columns.length; i++) { var column = columns[i]; var td = tr.insertCell(tr.cells.length); - if (column.name in self._collapsedColumnNames) { + if (self._collapsedColumnNames.hasOwnProperty(column.name)) { td.innerHTML = " "; } else { var cell = (column.cellIndex < cells.length) ? cells[column.cellIndex] : null;