thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Fix escape problems in the branch selector (#25875) (#26103)

Browse source 
Backport #25875 by @yp05327

Fix #25865

Co-authored-by: yp05327 <576951401@qq.com>
(cherry picked from commit 3e07c54be3)
This commit is contained in:
Giteabot 2023-07-25 02:14:18 -04:00 committed by Earl Warren
parent 78722734fe
commit 9fae415030
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
web_src/js/components/RepoBranchTagSelector.vue
View file

@ -108,7 +108,7 @@ const sfc = {
return this.items.filter((item) => item.name.toLowerCase() === this.searchTerm.toLowerCase()).length === 0; return this.items.filter((item) => item.name.toLowerCase() === this.searchTerm.toLowerCase()).length === 0;
}, },
formActionUrl() { formActionUrl() {
return `${this.repoLink}/branches/_new/${pathEscapeSegments(this.branchNameSubURL)}`; return `${this.repoLink}/branches/_new/${this.branchNameSubURL}`;
}, },
}, },
@ -274,15 +274,15 @@ export function initRepoBranchTagSelector(selector) {
if (data.showBranchesInDropdown && data.branches) { if (data.showBranchesInDropdown && data.branches) {
for (const branch of data.branches) { for (const branch of data.branches) {
data.items.push({name: branch, url: branch, branch: true, tag: false, selected: branch === data.defaultBranch}); data.items.push({name: branch, url: pathEscapeSegments(branch), branch: true, tag: false, selected: branch === data.defaultBranch});
} }
} }
if (!data.noTag && data.tags) { if (!data.noTag && data.tags) {
for (const tag of data.tags) { for (const tag of data.tags) {
if (data.release) { if (data.release) {
data.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === data.release.tagName}); data.items.push({name: tag, url: pathEscapeSegments(tag), branch: false, tag: true, selected: tag === data.release.tagName});
} else { } else {
data.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === data.defaultBranch}); data.items.push({name: tag, url: pathEscapeSegments(tag), branch: false, tag: true, selected: tag === data.defaultBranch});
} }
} }
} }