holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Et2Select: Avoid errors if freeEntry has single quote

Browse Source
This commit is contained in:
nathan 2022-09-27 13:54:54 -06:00
parent 49ac54b365
commit ffd6c21ed4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/Et2Select/Et2WidgetWithSelectMixin.ts
View File

@ -156,7 +156,7 @@ export const Et2widgetWithSelectMixin = <T extends Constructor<LitElement>>(supe
temp_target.querySelectorAll(":scope > *").forEach((item) => temp_target.querySelectorAll(":scope > *").forEach((item) =>
{ {
// Avoid duplicate error // Avoid duplicate error
if(!this._optionTargetNode.querySelector("[value='" + item.value + "']")) if(!this._optionTargetNode.querySelector("[value='" + item.value.replace(/'/g, '\\\'') + "']"))
{ {
this._optionTargetNode.appendChild(item); this._optionTargetNode.appendChild(item);
} }

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

@ -723,7 +723,7 @@ export const Et2WithSearchMixin = <T extends Constructor<LitElement>>(superclass
{ {
this.updateComplete.then(() => this.updateComplete.then(() =>
{ {
this.shadowRoot.querySelector("et2-tag[value='" + event.detail.item.value + "']")?.scrollIntoView(); this.shadowRoot.querySelector("et2-tag[value='" + event.detail.item.value.replace(/'/g, "\\\'") + "']")?.scrollIntoView();
}); });
} }
} }
@ -941,7 +941,7 @@ export const Et2WithSearchMixin = <T extends Constructor<LitElement>>(superclass
// Remove remote options that aren't used // Remove remote options that aren't used
let keepers = this._selected_remote.reduce((prev, current) => let keepers = this._selected_remote.reduce((prev, current) =>
{ {
return ":not([value='" + current.value + "'])"; return ":not([value='" + current.value.replace(/'/g, "\\\'") + "'])";
}, ""); }, "");
target.querySelectorAll(".remote" + keepers).forEach(o => o.remove()); target.querySelectorAll(".remote" + keepers).forEach(o => o.remove());
target.childNodes.forEach((n) => target.childNodes.forEach((n) =>
@ -1073,7 +1073,7 @@ export const Et2WithSearchMixin = <T extends Constructor<LitElement>>(superclass
temp_target.querySelectorAll(":scope > *").forEach((item) => temp_target.querySelectorAll(":scope > *").forEach((item) =>
{ {
// Avoid duplicate error // Avoid duplicate error
if(!target.querySelector("[value='" + item.value + "']")) if(!target.querySelector("[value='" + item.value.replace(/'/g, "\\\'") + "']"))
{ {
target.appendChild(item); target.appendChild(item);
} }
@ -1120,7 +1120,7 @@ export const Et2WithSearchMixin = <T extends Constructor<LitElement>>(superclass
return false; return false;
} }
// Make sure not to double-add // Make sure not to double-add
if(!this.querySelector("[value='" + text + "']") && !this.__select_options.find(o => o.value == text)) if(!this.querySelector("[value='" + text.replace(/'/g, "\\\'") + "']") && !this.__select_options.find(o => o.value == text))
{ {
this.__select_options.push(<SelectOption>{ this.__select_options.push(<SelectOption>{
value: text, value: text,
@ -1219,7 +1219,7 @@ export const Et2WithSearchMixin = <T extends Constructor<LitElement>>(superclass
this.updateComplete.then(() => this.updateComplete.then(() =>
{ {
const item = this.querySelector("[value='" + value + "']"); const item = this.querySelector("[value='" + value.replace(/'/g, "\\\'") + "']");
item.dispatchEvent(new CustomEvent("sl-select", {detail: {item}})); item.dispatchEvent(new CustomEvent("sl-select", {detail: {item}}));
}) })
} }
@ -1230,7 +1230,7 @@ export const Et2WithSearchMixin = <T extends Constructor<LitElement>>(superclass
if(this.multiple) if(this.multiple)
{ {
this.value = this.value.filter(v => v !== original); this.value = this.value.filter(v => v !== original);
this.querySelector("[value='" + original + "']")?.remove(); this.querySelector("[value='" + original.replace(/'/g, "\\\'") + "']")?.remove();
} }
else else
{ {