Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 21:04:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make changes to fix special characters in Criterion labels (#1819) (#2301)

Browse Source 
Reverse the '&' and '+' replacement done on StringCriterion
Decodes special characters in IHierarchicalLabeledIdCriterion
This commit is contained in:
DampToast
2022-02-09 19:49:25 -06:00
committed by GitHub
parent 47670d1e94
commit 67b1d15efc
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ui/v2.5/src/models/list-filter/criteria/criterion.ts
View File

@@ -206,7 +206,10 @@ export function createStringCriterionOption(
export class StringCriterion extends Criterion<string> { export class StringCriterion extends Criterion<string> {
public getLabelValue() { public getLabelValue() {
return this.value; let ret = this.value;
ret = StringCriterion.unreplaceSpecialCharacter(ret, "&");
ret = StringCriterion.unreplaceSpecialCharacter(ret, "+");
return ret;
} }
public encodeValue() { public encodeValue() {
@@ -221,6 +224,10 @@ export class StringCriterion extends Criterion<string> {
return str.replaceAll(c, encodeURIComponent(c)); return str.replaceAll(c, encodeURIComponent(c));
} }
private static unreplaceSpecialCharacter(str: string, c: string) {
return str.replaceAll(encodeURIComponent(c), c);
}
constructor(type: CriterionOption) { constructor(type: CriterionOption) {
super(type, ""); super(type, "");
} }
@@ -435,7 +442,9 @@ export class IHierarchicalLabeledIdCriterion extends Criterion<IHierarchicalLabe
} }
public getLabelValue(): string { public getLabelValue(): string {
const labels = (this.value.items ?? []).map((v) => v.label).join(", "); const labels = decodeURI(
(this.value.items ?? []).map((v) => v.label).join(", ")
);
if (this.value.depth === 0) { if (this.value.depth === 0) {
return labels; return labels;