From 71605c0c144c5ff1e326a58de2ebcce6351e72f5 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 20 Aug 2020 16:18:39 +0200 Subject: [PATCH] * All Apps: fix print list column selection does not contain customfields --- api/js/etemplate/et2_extension_nextmatch.js | 8 ++++---- api/js/etemplate/et2_extension_nextmatch.ts | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/js/etemplate/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js index 820d369dcd..c6fbdb1bdb 100644 --- a/api/js/etemplate/et2_extension_nextmatch.js +++ b/api/js/etemplate/et2_extension_nextmatch.js @@ -1914,17 +1914,17 @@ var et2_nextmatch = /** @class */ (function (_super) { var col = columnMgr.columns[i]; var widget = this.columns[i].widget; var colName = this._getColumnName(widget); - if (col.caption && col.visibility !== et2_dataview_view_grid_1.et2_dataview_grid.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && - col.visibility !== et2_dataview_view_grid_1.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[colName] = col.caption; - if (col.visibility === et2_dataview_view_grid_1.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(colName); } // Custom fields get listed separately if (widget.instanceOf(et2_nextmatch_customfields)) { delete (columns[colName]); colName = widget.id; - if (col.visibility === et2_dataview_view_grid_1.et2_dataview_grid.ET2_COL_VISIBILITY_VISIBLE && !jQuery.isEmptyObject(widget.customfields)) { + if (col.visibility === et2_dataview_model_columns_1.et2_dataview_column.ET2_COL_VISIBILITY_VISIBLE && !jQuery.isEmptyObject(widget.customfields)) { columns[colName] = col.caption; for (var field_name in widget.customfields) { columns[et2_nextmatch_customfields.PREFIX + field_name] = " - " + widget.customfields[field_name].label; diff --git a/api/js/etemplate/et2_extension_nextmatch.ts b/api/js/etemplate/et2_extension_nextmatch.ts index 8e079e1cd6..f0320787d6 100644 --- a/api/js/etemplate/et2_extension_nextmatch.ts +++ b/api/js/etemplate/et2_extension_nextmatch.ts @@ -2583,18 +2583,18 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2 const widget = this.columns[i].widget; let colName = this._getColumnName(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[colName] = col.caption; - if(col.visibility === et2_dataview_grid.ET2_COL_VISIBILITY_VISIBLE) columns_selected.push(colName); + if (col.visibility === et2_dataview_column.ET2_COL_VISIBILITY_VISIBLE) columns_selected.push(colName); } // Custom fields get listed separately if(widget.instanceOf(et2_nextmatch_customfields)) { delete(columns[colName]); colName = widget.id; - if(col.visibility === et2_dataview_grid.ET2_COL_VISIBILITY_VISIBLE && ! + if (col.visibility === et2_dataview_column.ET2_COL_VISIBILITY_VISIBLE && ! jQuery.isEmptyObject((widget).customfields) ) {