From 6c0102e7e77f801e04f1abd721aa1b5f4cf073b0 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 10 Feb 2020 16:00:14 -0700 Subject: [PATCH] Fix nextmatch column select dialog --- api/js/etemplate/et2_extension_nextmatch.js | 10 +++++----- api/js/etemplate/et2_extension_nextmatch.ts | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api/js/etemplate/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js index 3486b777b2..d86e3ccd21 100644 --- a/api/js/etemplate/et2_extension_nextmatch.js +++ b/api/js/etemplate/et2_extension_nextmatch.js @@ -1055,10 +1055,10 @@ var et2_nextmatch = /** @class */ (function (_super) { for (var i = 0; i < columnMgr.columns.length; i++) { var col = columnMgr.columns[i]; var widget = this.columns[i].widget; - if (col.caption && col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && - col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_DISABLED) { + if (col.caption && col.visibility !== et2_dataview_model_columns_1.et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && + col.visibility !== et2_dataview_model_columns_1.et2_dataview_column.ET2_COL_VISIBILITY_DISABLED) { columns[col.id] = col.caption; - if (col.visibility == et2_dataview_grid.ET2_COL_VISIBILITY_VISIBLE) + if (col.visibility == et2_dataview_model_columns_1.et2_dataview_column.ET2_COL_VISIBILITY_VISIBLE) columns_selected.push(col.id); } // Custom fields get listed separately @@ -1122,8 +1122,8 @@ var et2_nextmatch = /** @class */ (function (_super) { var visibility = {}; for (var i = 0; i < columnMgr.columns.length; i++) { var col = columnMgr.columns[i]; - if (col.caption && col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && - col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_DISABLED) { + if (col.caption && col.visibility !== et2_dataview_model_columns_1.et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && + col.visibility !== et2_dataview_model_columns_1.et2_dataview_column.ET2_COL_VISIBILITY_DISABLED) { visibility[col.id] = { visible: false }; } } diff --git a/api/js/etemplate/et2_extension_nextmatch.ts b/api/js/etemplate/et2_extension_nextmatch.ts index 467c7fafa0..1b63cc5fc9 100644 --- a/api/js/etemplate/et2_extension_nextmatch.ts +++ b/api/js/etemplate/et2_extension_nextmatch.ts @@ -1494,11 +1494,11 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2 var col = columnMgr.columns[i]; var widget = this.columns[i].widget; - if(col.caption && col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && - col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_DISABLED) + if(col.caption && col.visibility !== et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && + col.visibility !== et2_dataview_column.ET2_COL_VISIBILITY_DISABLED) { columns[col.id] = col.caption; - if(col.visibility == et2_dataview_grid.ET2_COL_VISIBILITY_VISIBLE) columns_selected.push(col.id); + if(col.visibility == et2_dataview_column.ET2_COL_VISIBILITY_VISIBLE) columns_selected.push(col.id); } // Custom fields get listed separately if(widget.instanceOf(et2_nextmatch_customfields)) @@ -1570,8 +1570,8 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2 for (var i = 0; i < columnMgr.columns.length; i++) { var col = columnMgr.columns[i]; - if(col.caption && col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && - col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_DISABLED ) + if(col.caption && col.visibility !== et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && + col.visibility !== et2_dataview_column.ET2_COL_VISIBILITY_DISABLED ) { visibility[col.id] = {visible: false}; }