extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 12:51:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix search letter cannot be disabled

Browse Source
This commit is contained in:
nathan 2022-08-17 16:26:22 -06:00
parent dce4ac78fc
commit 24d9d3ef53
2 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,6 +270,15 @@ export class Et2ColumnSelection extends Et2InputWidget(LitElement)
} }
} }
}); });
// Add in letters
this.shadowRoot.querySelectorAll("[part='columns'] > :not(.column)").forEach((i : SlMenuItem) =>
{
if(i.checked)
{
value.push(i.value);
}
})
return value; return value;
} }

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

@ -1978,35 +1978,35 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
if(col.caption && col.visibility !== et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT && if(col.caption && col.visibility !== et2_dataview_column.ET2_COL_VISIBILITY_ALWAYS_NOSELECT &&
col.visibility !== et2_dataview_column.ET2_COL_VISIBILITY_DISABLED) col.visibility !== et2_dataview_column.ET2_COL_VISIBILITY_DISABLED)
{ {
visibility[col.id] = {visible: false}; visibility[col.id] = {visible: false};
} }
} }
const value = selectPopup.value; const value = selectPopup.value;
// Update & remove letter filter // Update & remove letter filter
if(self.header.lettersearch) if(self.header.lettersearch)
{
var show_letters = true;
if(value.indexOf(LETTERS) >= 0)
{ {
var show_letters = true; value.splice(value.indexOf(LETTERS), 1);
if(value.indexOf(LETTERS) >= 0)
{
value.splice(value.indexOf(LETTERS), 1);
}
else
{
show_letters = false;
}
self._set_lettersearch(show_letters);
} }
self.sortedColumnsList = []; else
for(var i = 0; i < value.length; i++)
{ {
// Handle skipped columns show_letters = false;
let column = 0; }
while(value[i] != "col_" + column && column < columnMgr.columns.length) self._set_lettersearch(show_letters);
{ }
column++; self.sortedColumnsList = [];
} for(var i = 0; i < value.length; i++)
if(visibility[value[i]]) {
// Handle skipped columns
let column = 0;
while(value[i] != "col_" + column && column < columnMgr.columns.length)
{
column++;
}
if(visibility[value[i]])
{ {
visibility[value[i]].visible = true; visibility[value[i]].visible = true;
} }