extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix sidebox owner could not select options

Browse Source
This commit is contained in:
nathan 2023-10-02 16:06:25 -06:00
parent 72112023e8
commit efe0eff776
3 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/js/etemplate/Et2Select/SearchMixin.ts
View File

@ -195,7 +195,7 @@ export const Et2WithSearchMixin = dedupeMixin(<T extends Constructor<LitElement>
/* Hide options that do not match current search text */
.no-match {
[searching] .no-match {
display: none;
}
/* Different cursor for editable tags */
@ -1043,6 +1043,8 @@ export const Et2WithSearchMixin = dedupeMixin(<T extends Constructor<LitElement>
// Stop timeout timer
clearTimeout(this._searchTimeout);
this.setAttribute("searching", "");
// Show a spinner
let spinner = document.createElement("sl-spinner");
spinner.slot = "expand-icon";
@ -1066,6 +1068,7 @@ export const Et2WithSearchMixin = dedupeMixin(<T extends Constructor<LitElement>
this.remoteSearch(this._searchInputNode.value, this.searchOptions)
]).then(async() =>
{
this.removeAttribute("searching");
// Remove spinner
spinner.remove();
@ -1102,7 +1105,7 @@ export const Et2WithSearchMixin = dedupeMixin(<T extends Constructor<LitElement>
let target = this._optionTargetNode || this;
this._keepSelectedRemote();
this._remote_options = [];
// Not searching anymore, clear flag

21
calendar/js/CalendarOwner.ts
View File

@ -64,9 +64,8 @@ export class CalendarOwner extends Et2StaticSelectMixin(Et2Select)
return html``;
}
// Tag used must match this.optionTag, but you can't use the variable directly.
// Pass option along so SearchMixin can grab it if needed
const value = (<string>option.value).replaceAll(" ", "___");
const classes = option.class ? Object.fromEntries((option.class).split(" ").map(k => [k, true])) : {};
return html`
<sl-option
part="option"
@ -76,7 +75,7 @@ export class CalendarOwner extends Et2StaticSelectMixin(Et2Select)
class=${classMap({
"match": option.isMatch,
"no-match": !option.isMatch,
...Object.fromEntries((option.class || "").split(" ").map(k => [k, true]))
...classes
})}
.option=${option}
.selected=${this.getValueAsArray().some(v => v == value)}
@ -88,22 +87,6 @@ export class CalendarOwner extends Et2StaticSelectMixin(Et2Select)
</sl-option>`;
}
/**
* Customise how tags are rendered. Overridden from parent to add email to title for hover
*
* @param item
* @protected
*/
protected _createTagNode(item)
{
const tag = super._createTagNode(item);
if(item.title)
{
tag.title = item.title;
}
return tag;
}
/**
* Override parent to handle our special additional data types (c#,r#,etc.) when they
* are not available client side.

2
calendar/templates/default/sidebox.xet
View File

@ -21,7 +21,7 @@ Egroupware
<et2-select-cat id="cat_id" placeholder="All categories" onchange="app.calendar.update_state({cat_id: widget.getValue()});" emptyLabel="All categories" multiple="true"></et2-select-cat>
<et2-select id="status_filter" onchange="app.calendar.update_state({status_filter: widget.getValue()});" noLang="true"></et2-select>
<hrule/>
<et2-calendar-owner id="owner" onchange="app.calendar.update_state({owner: widget.getValue()}); return false;" multiple="true" allowFreeEntries="false" autocompleteParams="{&quot;checkgrants&quot;: true}"/>
<et2-calendar-owner id="owner" onchange="app.calendar.update_state({owner: widget.getValue()}); return false;" multiple="true" allowFreeEntries="false" tabindex="0"/>
<hrule/>
<et2-box>
<grid id="integration" disabled="!@integration" width="100%">