holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix nextmatch column select dialog

Browse Source
This commit is contained in:
nathangray 2020-02-10 16:00:14 -07:00
parent 64844fc97d
commit 6c0102e7e7
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/js/etemplate/et2_extension_nextmatch.js
View File

@ -1055,10 +1055,10 @@ var et2_nextmatch = /** @class */ (function (_super) {
for (var i = 0; i < columnMgr.columns.length; i++) { for (var i = 0; i < columnMgr.columns.length; i++) {
var col = columnMgr.columns[i]; var col = columnMgr.columns[i];
var widget = this.columns[i].widget; var widget = this.columns[i].widget;
if (col.caption && col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && if (col.caption && col.visibility !== et2_dataview_model_columns_1.et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT &&
col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_DISABLED) { col.visibility !== et2_dataview_model_columns_1.et2_dataview_column.ET2_COL_VISIBILITY_DISABLED) {
columns[col.id] = col.caption; 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); columns_selected.push(col.id);
} }
// Custom fields get listed separately // Custom fields get listed separately
@ -1122,8 +1122,8 @@ var et2_nextmatch = /** @class */ (function (_super) {
var visibility = {}; var visibility = {};
for (var i = 0; i < columnMgr.columns.length; i++) { for (var i = 0; i < columnMgr.columns.length; i++) {
var col = columnMgr.columns[i]; var col = columnMgr.columns[i];
if (col.caption && col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && if (col.caption && col.visibility !== et2_dataview_model_columns_1.et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT &&
col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_DISABLED) { col.visibility !== et2_dataview_model_columns_1.et2_dataview_column.ET2_COL_VISIBILITY_DISABLED) {
visibility[col.id] = { visible: false }; visibility[col.id] = { visible: false };
} }
} }

10
api/js/etemplate/et2_extension_nextmatch.ts
View File

@ -1494,11 +1494,11 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
var col = columnMgr.columns[i]; var col = columnMgr.columns[i];
var widget = this.columns[i].widget; var widget = this.columns[i].widget;
if(col.caption && col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && if(col.caption && col.visibility !== et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT &&
col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_DISABLED) col.visibility !== et2_dataview_column.ET2_COL_VISIBILITY_DISABLED)
{ {
columns[col.id] = col.caption; 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 // Custom fields get listed separately
if(widget.instanceOf(et2_nextmatch_customfields)) 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++) for (var i = 0; i < columnMgr.columns.length; i++)
{ {
var col = columnMgr.columns[i]; var col = columnMgr.columns[i];
if(col.caption && col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && if(col.caption && col.visibility !== et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT &&
col.visibility !== et2_dataview_grid.ET2_COL_VISIBILITY_DISABLED ) col.visibility !== et2_dataview_column.ET2_COL_VISIBILITY_DISABLED )
{ {
visibility[col.id] = {visible: false}; visibility[col.id] = {visible: false};
} }