TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix incorrect default branch label while switching between branches (#27053)

Browse source 
Fix #27008
This commit is contained in:
yp05327 2023-09-14 12:54:25 +09:00 committed by GitHub
parent b32998b3f5
commit 076eca8158
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
templates/repo/branch_dropdown.tmpl
View file

@ -3,12 +3,12 @@
* ContainerClasses
* (TODO: search "branch_dropdown" in the template direcotry)
*/}}
{{$defaultBranch := $.root.BranchName}}
{{$defaultSelectedRefName := $.root.BranchName}}
{{if and .root.IsViewTag (not .noTag)}}
{{$defaultBranch = .root.TagName}}
{{$defaultSelectedRefName = .root.TagName}}
{{end}}
{{if eq $defaultBranch ""}}
{{$defaultBranch = $.root.Repository.DefaultBranch}}
{{if eq $defaultSelectedRefName ""}}
{{$defaultSelectedRefName = $.root.Repository.DefaultBranch}}
{{end}}
{{$type := ""}}
@ -45,7 +45,8 @@
'tagName': {{.root.TagName}},
'branchName': {{.root.BranchName}},
'noTag': {{.noTag}},
'defaultBranch': {{$defaultBranch}},
'defaultSelectedRefName': {{$defaultSelectedRefName}},
'repoDefaultBranch': {{.root.Repository.DefaultBranch}},
'enableFeed': {{.root.EnableFeed}},
'rssURLPrefix': '{{$.root.RepoLink}}/rss/branch/',
'branchURLPrefix': '{{if .branchURLPrefix}}{{.branchURLPrefix}}{{else}}{{$.root.RepoLink}}/{{if $.root.PageIsCommits}}commits{{else}}src{{end}}/branch/{{end}}',

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

@ -190,16 +190,15 @@ const sfc = {
}
this.isLoading = true;
try {
// the "data.defaultBranch" is ambiguous, it could be "branch name" or "tag name"
const reqUrl = `${this.repoLink}/${this.mode}/list`;
const resp = await fetch(reqUrl);
const {results} = await resp.json();
for (const result of results) {
let selected = false;
if (this.mode === 'branches') {
selected = result === this.defaultBranch;
selected = result === this.defaultSelectedRefName;
} else {
selected = result === (this.release ? this.release.tagName : this.defaultBranch);
selected = result === (this.release ? this.release.tagName : this.defaultSelectedRefName);
}
this.items.push({name: result, url: pathEscapeSegments(result), branch: this.mode === 'branches', tag: this.mode === 'tags', selected});
}
@ -276,7 +275,7 @@ export default sfc; // activate IDE's Vue plugin
<div class="loading-indicator is-loading" v-if="isLoading"/>
<div v-for="(item, index) in filteredItems" :key="item.name" class="item" :class="{selected: item.selected, active: active === index}" @click="selectItem(item)" :ref="'listItem' + index">
{{ item.name }}
<div class="ui label" v-if="item.name===defaultBranch && mode === 'branches'">
<div class="ui label" v-if="item.name===repoDefaultBranch && mode === 'branches'">
{{ textDefaultBranchLabel }}
</div>
<a v-show="enableFeed && mode === 'branches'" role="button" class="rss-icon gt-float-right" :href="rssURLPrefix + item.url" target="_blank" @click.stop>