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

Api: Fix nm columnselection still showed disabled columns

Browse Source
This commit is contained in:
nathan 2023-07-12 15:08:31 -06:00
parent b33f41c8b2
commit e6f142c7a4
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/js/etemplate/Et2Nextmatch/ColumnSelection.ts
View File

@ -132,13 +132,19 @@ export class Et2ColumnSelection extends Et2InputWidget(LitElement)
*/ */
protected rowTemplate(column) : TemplateResult protected rowTemplate(column) : TemplateResult
{ {
let isCustom = column.widget?.instanceOf(et2_nextmatch_customfields) || false; const isCustom = column.widget?.instanceOf(et2_nextmatch_customfields) || false;
/* ?disabled=${column.visibility == et2_dataview_column.ET2_COL_VISIBILITY_DISABLED} */ const alwaysOn = [et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS, et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT].indexOf(column.visibility) !== -1;
// Don't show disabled columns
if(column.visibility == et2_dataview_column.ET2_COL_VISIBILITY_DISABLED)
{
return html``;
}
return html` return html`
<sl-menu-item <sl-menu-item
value="${column.id}" value="${column.id}"
?checked=${column.visibility == et2_dataview_column.ET2_COL_VISIBILITY_VISIBLE} ?checked=${alwaysOn || column.visibility == et2_dataview_column.ET2_COL_VISIBILITY_VISIBLE}
?disabled=${alwaysOn}
title="${column.title}" title="${column.title}"
class="${classMap({ class="${classMap({
select_row: true, select_row: true,

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

@ -1991,7 +1991,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
columns.push({ columns.push({
id: LETTERS, id: LETTERS,
caption: this.egw().lang('Search letter'), caption: this.egw().lang('Search letter'),
visibility: (this.header.lettersearch.is(':visible') ? et2_dataview_column.ET2_COL_VISIBILITY_VISIBLE : et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT) visibility: (this.header.lettersearch.is(':visible') ? et2_dataview_column.ET2_COL_VISIBILITY_VISIBLE : et2_dataview_column.ET2_COL_VISIBILITY_INVISIBLE)
}); });
} }