extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-16 18:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

* All Apps: fix print list column selection does not contain customfields

Browse Source
This commit is contained in:
Hadi Nategh 2020-08-20 16:18:39 +02:00
parent d48efdedd8
commit 71605c0c14
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1914,17 +1914,17 @@ var et2_nextmatch = /** @class */ (function (_super) {
var col = columnMgr.columns[i]; var col = columnMgr.columns[i];
var widget = this.columns[i].widget; var widget = this.columns[i].widget;
var colName = this._getColumnName(widget); var colName = this._getColumnName(widget);
if (col.caption && col.visibility !== et2_dataview_view_grid_1.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_view_grid_1.et2_dataview_grid.ET2_COL_VISIBILITY_DISABLED) { col.visibility !== et2_dataview_model_columns_1.et2_dataview_column.ET2_COL_VISIBILITY_DISABLED) {
columns[colName] = col.caption; 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); columns_selected.push(colName);
} }
// Custom fields get listed separately // Custom fields get listed separately
if (widget.instanceOf(et2_nextmatch_customfields)) { if (widget.instanceOf(et2_nextmatch_customfields)) {
delete (columns[colName]); delete (columns[colName]);
colName = widget.id; 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; columns[colName] = col.caption;
for (var field_name in widget.customfields) { for (var field_name in widget.customfields) {
columns[et2_nextmatch_customfields.PREFIX + field_name] = " - " + widget.customfields[field_name].label; columns[et2_nextmatch_customfields.PREFIX + field_name] = " - " + widget.customfields[field_name].label;

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

@ -2583,18 +2583,18 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
const widget = this.columns[i].widget; const widget = this.columns[i].widget;
let colName = this._getColumnName(widget); let colName = this._getColumnName(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[colName] = col.caption; 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 // Custom fields get listed separately
if(widget.instanceOf(et2_nextmatch_customfields)) if(widget.instanceOf(et2_nextmatch_customfields))
{ {
delete(columns[colName]); delete(columns[colName]);
colName = widget.id; 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((<et2_nextmatch_customfields><unknown>widget).customfields) jQuery.isEmptyObject((<et2_nextmatch_customfields><unknown>widget).customfields)
) )
{ {