Fix branch dropdown not display ref name (#33159)

Before: ![image](https://github.com/user-attachments/assets/899d25a9-80e9-48d5-a820-79c911c858e9) After: ![image](https://github.com/user-attachments/assets/cf2a7407-909a-41db-9957-19d9214af57e) --------- Co-authored-by: wxiaoguang <[email protected]>
go-gitea · Jan 9, 2025 · 2298ff2 · 2298ff2
1 parent 5f679c1
commit 2298ff2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 20 deletions.
diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
@@ -1,8 +1,8 @@
 {{/* Attributes:
 * ContainerClasses
 * Repository
-* CurrentRefType: eg. "branch", "tag"
-* CurrentRefShortName: eg. "master", "v1.0"
+* CurrentRefType: eg. "branch", "tag", "commit"
+* CurrentRefShortName: eg. "master", "v1.0", "abcdef0123"
 * CurrentTreePath
 * RefLinkTemplate: redirect to the link when a branch/tag is selected
 * RefFormActionTemplate: change the parent form's action when a branch/tag is selected

diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl
@@ -5,14 +5,19 @@
 		{{template "repo/sub_menu" .}}
 		<div class="repo-button-row">
 			<div class="repo-button-row-left">
-
-				{{$branchDropdownCurrentRefType := "branch"}}
-				{{$branchDropdownCurrentRefShortName := .BranchName}}
-				{{if .IsViewTag}}
-					{{$branchDropdownCurrentRefType = "tag"}}
-					{{$branchDropdownCurrentRefShortName = .TagName}}
-				{{end}}
-				{{template "repo/branch_dropdown" dict
+				{{- /* for /owner/repo/commits/branch/the-name */ -}}
+				{{- $branchDropdownCurrentRefType := "branch" -}}
+				{{- $branchDropdownCurrentRefShortName := .BranchName -}}
+				{{- if .IsViewTag -}}
+					{{- /* for /owner/repo/commits/tag/the-name */ -}}
+					{{- $branchDropdownCurrentRefType = "tag" -}}
+					{{- $branchDropdownCurrentRefShortName = .TagName -}}
+				{{- else if .IsViewCommit -}}
+					{{- /* for /owner/repo/commits/commit/000000 */ -}}
+					{{- $branchDropdownCurrentRefType = "commit" -}}
+					{{- $branchDropdownCurrentRefShortName = ShortSha .CommitID -}}
+				{{- end -}}
+				{{- template "repo/branch_dropdown" dict
 					"Repository" .Repository
 					"ShowTabBranches" true
 					"ShowTabTags" true
@@ -21,8 +26,7 @@
 					"CurrentTreePath" .TreePath
 					"RefLinkTemplate" "{RepoLink}/commits/{RefType}/{RefShortName}/{TreePath}"
 					"AllowCreateNewRef" .CanCreateBranch
-				}}
-
+				-}}
 				<a href="{{.RepoLink}}/graph" class="ui basic small compact button">
 					{{svg "octicon-git-branch"}}
 					{{ctx.Locale.Tr "repo.commit_graph"}}

diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
@@ -24,13 +24,19 @@
 				{{template "repo/sub_menu" .}}
 				<div class="repo-button-row">
 					<div class="repo-button-row-left">
-						{{$branchDropdownCurrentRefType := "branch"}}
-						{{$branchDropdownCurrentRefShortName := .BranchName}}
-						{{if .IsViewTag}}
-							{{$branchDropdownCurrentRefType = "tag"}}
-							{{$branchDropdownCurrentRefShortName = .TagName}}
-						{{end}}
-						{{template "repo/branch_dropdown" dict
+						{{- /* for repo home (default branch) and /owner/repo/src/branch/the-name */ -}}
+						{{- $branchDropdownCurrentRefType := "branch" -}}
+						{{- $branchDropdownCurrentRefShortName := .BranchName -}}
+						{{- if .IsViewTag -}}
+							{{- /* for /owner/repo/src/tag/the-name */ -}}
+							{{- $branchDropdownCurrentRefType = "tag" -}}
+							{{- $branchDropdownCurrentRefShortName = .TagName -}}
+						{{- else if .IsViewCommit -}}
+							{{- /* for /owner/repo/src/commit/000000 */ -}}
+							{{- $branchDropdownCurrentRefType = "commit" -}}
+							{{- $branchDropdownCurrentRefShortName = ShortSha .CommitID -}}
+						{{- end -}}
+						{{- template "repo/branch_dropdown" dict
 							"Repository" .Repository
 							"ShowTabBranches" true
 							"ShowTabTags" true
@@ -40,7 +46,7 @@
 							"RefLinkTemplate" "{RepoLink}/src/{RefType}/{RefShortName}/{TreePath}"
 							"AllowCreateNewRef" .CanCreateBranch
 							"ShowViewAllRefsEntry" true
-						}}
+						-}}
 						{{if and .CanCompareOrPull .IsViewBranch (not .Repository.IsArchived)}}
 							{{$cmpBranch := ""}}
 							{{if ne .Repository.ID .BaseRepo.ID}}