extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 18:33:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix email tags marked as invalid

Browse Source
This commit is contained in:
nathan 2023-07-27 13:19:43 -06:00
parent 881d3c05c5
commit 149e2fec76
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -346,35 +346,8 @@ export const Et2WithSearchMixin = <T extends Constructor<LitElement>>(superclass
// Decode URL, possibly again. If set in template, it can wind up double-encoded. // Decode URL, possibly again. If set in template, it can wind up double-encoded.
this.searchUrl = this.egw().decodePath(this.searchUrl); this.searchUrl = this.egw().decodePath(this.searchUrl);
} }
}
update(changedProperties) // Add missing options if search or free entries enabled
{
super.update(changedProperties);
// One of the key properties has changed, need to add the needed nodes
if(changedProperties.has("search") || changedProperties.has("editModeEnabled") || changedProperties.has("allowFreeEntries"))
{
// Missing any of the required attributes? Now we need to take it out.
if(!this.searchEnabled && !this.editModeEnabled && !this.allowFreeEntries || this.readonly)
{
this.querySelector(".search_input")?.remove();
return;
}
// Normally this should be handled in render(), but we have to add our nodes in
this._addNodes();
}
// Update any tags if edit mode changes
if(changedProperties.has("editModeEnabled") || changedProperties.has("readonly"))
{
// Required because we explicitly create tags instead of doing it in render()
this.shadowRoot.querySelectorAll(".select__tags > *").forEach((tag : Et2Tag) =>
{
tag.editable = this.editModeEnabled && !this.readonly;
tag.removable = !this.readonly;
});
}
if(changedProperties.has("value") && this.value) if(changedProperties.has("value") && this.value)
{ {
// Overridden to add options if allowFreeEntries=true // Overridden to add options if allowFreeEntries=true
@ -409,6 +382,35 @@ export const Et2WithSearchMixin = <T extends Constructor<LitElement>>(superclass
} }
} }
update(changedProperties)
{
super.update(changedProperties);
// One of the key properties has changed, need to add the needed nodes
if(changedProperties.has("search") || changedProperties.has("editModeEnabled") || changedProperties.has("allowFreeEntries"))
{
// Missing any of the required attributes? Now we need to take it out.
if(!this.searchEnabled && !this.editModeEnabled && !this.allowFreeEntries || this.readonly)
{
this.querySelector(".search_input")?.remove();
return;
}
// Normally this should be handled in render(), but we have to add our nodes in
this._addNodes();
}
// Update any tags if edit mode changes
if(changedProperties.has("editModeEnabled") || changedProperties.has("readonly"))
{
// Required because we explicitly create tags instead of doing it in render()
this.shadowRoot.querySelectorAll(".select__tags > *").forEach((tag : Et2Tag) =>
{
tag.editable = this.editModeEnabled && !this.readonly;
tag.removable = !this.readonly;
});
}
}
/** /**
* Add the nodes we need to search - adjust parent shadowDOM * Add the nodes we need to search - adjust parent shadowDOM
* *